diff --git a/.vpython b/.vpython deleted file mode 100644 index 76d86bb52b..0000000000 --- a/.vpython +++ /dev/null @@ -1 +0,0 @@ -python_version: "3.8" \ No newline at end of file diff --git a/gn/codesign_ios.py b/gn/codesign_ios.py index 06e0c90251..6f546531c8 100755 --- a/gn/codesign_ios.py +++ b/gn/codesign_ios.py @@ -23,8 +23,7 @@ pkg,identstr,profile = sys.argv[1:] # Find the signing identity. identity = None -for line in subprocess.check_output([ - 'security', 'find-identity']).decode('utf-8').split('\n'): +for line in subprocess.check_output(['security', 'find-identity']).split('\n'): m = re.match(r'''.*\) (.*) "''' + identstr + '"', line) if m: identity = m.group(1) diff --git a/gn/compile_ib_files.py b/gn/compile_ib_files.py index 67c4976985..d53fa15790 100644 --- a/gn/compile_ib_files.py +++ b/gn/compile_ib_files.py @@ -40,9 +40,9 @@ def main(): ibtool_section_re = re.compile(r'/\*.*\*/') ibtool_re = re.compile(r'.*note:.*is clipping its content') try: - stdout = subprocess.check_output(ibtool_args).decode('utf-8') + stdout = subprocess.check_output(ibtool_args) except subprocess.CalledProcessError as e: - print(e.output.decode('utf-8')) + print(e.output) raise current_section_header = None for line in stdout.splitlines(): diff --git a/gn/compile_sksl_tests.py b/gn/compile_sksl_tests.py index bcb1655756..fbb8366260 100755 --- a/gn/compile_sksl_tests.py +++ b/gn/compile_sksl_tests.py @@ -28,12 +28,11 @@ def executeWorklist(input, worklist): # Invoke skslc, passing in the worklist. worklist.close() try: - output = subprocess.check_output([ - skslc, worklist.name], stderr=subprocess.STDOUT).decode('utf-8') + output = subprocess.check_output([skslc, worklist.name], stderr=subprocess.STDOUT) except subprocess.CalledProcessError as err: if err.returncode != 1: print("### " + input + " skslc error:\n") - print("\n".join(err.output.decode('utf-8').splitlines())) + print("\n".join(err.output.splitlines())) sys.exit(err.returncode) pass # Compile errors (exit code 1) are expected and normal in test code diff --git a/gn/copy_git_directory.py b/gn/copy_git_directory.py index e8490063a2..04623baf50 100755 --- a/gn/copy_git_directory.py +++ b/gn/copy_git_directory.py @@ -21,8 +21,7 @@ def copy_git_directory(src, dst, out=None): raise Exception('Directory "%s" does not exist.' % src) if not os.path.isdir(dst): os.makedirs(dst) - ls_files = subprocess.check_output([ - 'git', 'ls-files', '-z', '.'], cwd=src).decode('utf-8') + ls_files = subprocess.check_output(['git', 'ls-files', '-z', '.'], cwd=src) src_files = set(p for p in ls_files.split('\0') if p) abs_src = os.path.abspath(src) cwd = os.getcwd() diff --git a/gn/dehydrate_sksl.py b/gn/dehydrate_sksl.py index d7192e3710..e4dccd06ec 100644 --- a/gn/dehydrate_sksl.py +++ b/gn/dehydrate_sksl.py @@ -20,8 +20,7 @@ for inc in includes: if not os.path.isdir(targetDir): os.mkdir(targetDir) target = os.path.join(targetDir, tail) - subprocess.check_output([ - skslc, inc, target + ".dehydrated.sksl"]).decode('utf-8') + subprocess.check_output([skslc, inc, target + ".dehydrated.sksl"]) except subprocess.CalledProcessError as err: print("### Error compiling " + inc + ":") print(err.output) diff --git a/gn/find_headers.py b/gn/find_headers.py index aafa5532ef..1fc56c3434 100755 --- a/gn/find_headers.py +++ b/gn/find_headers.py @@ -34,9 +34,9 @@ gn_desc_cmd = [gn, 'desc', '.', '--root=%s' % absolute_source, '--format=json', desc_json_txt = '' try: - desc_json_txt = subprocess.check_output(gn_desc_cmd).decode('utf-8') + desc_json_txt = subprocess.check_output(gn_desc_cmd) except subprocess.CalledProcessError as e: - print(e.output.decode('utf-8')) + print(e.output) raise desc_json = {} diff --git a/gn/find_xcode_sysroot.py b/gn/find_xcode_sysroot.py index e514271bc3..be5b687e03 100755 --- a/gn/find_xcode_sysroot.py +++ b/gn/find_xcode_sysroot.py @@ -12,5 +12,4 @@ import sys (sdk,) = sys.argv[1:] -print(subprocess.check_output([ - 'xcrun', '--sdk', sdk, '--show-sdk-path']).decode('utf-8')) +print(subprocess.check_output(['xcrun', '--sdk', sdk, '--show-sdk-path'])) diff --git a/go.mod b/go.mod index 956849c088..4c51ff22d3 100644 --- a/go.mod +++ b/go.mod @@ -49,7 +49,7 @@ require ( github.com/yosuke-furukawa/json5 v0.1.1 // indirect go.chromium.org/gae v0.0.0-20190826183307-50a499513efa // indirect go.chromium.org/luci v0.0.0-20201121231857-b9ab316d7198 // indirect - go.skia.org/infra v0.0.0-20211115132608-15374cc24841 + go.skia.org/infra v0.0.0-20211110142552-553519b41e71 go.starlark.net v0.0.0-20201118183435-e55f603d8c79 // indirect golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83 golang.org/x/exp v0.0.0-20200228211341-fcea875c7e85 // indirect diff --git a/go.sum b/go.sum index d664ff202d..f2d75106e2 100644 --- a/go.sum +++ b/go.sum @@ -2093,10 +2093,6 @@ go.skia.org/infra v0.0.0-20210910143316-141caab7391e h1:klXhFdngbjdDI+e9m+iLvFqu go.skia.org/infra v0.0.0-20210910143316-141caab7391e/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM= go.skia.org/infra v0.0.0-20211110142552-553519b41e71 h1:MsyIiBuNicDVyMBAECY6QO6A/BpjTdRgImiWQ9iaQro= go.skia.org/infra v0.0.0-20211110142552-553519b41e71/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM= -go.skia.org/infra v0.0.0-20211111154509-8e43ef9acc1b h1:eXp9iKtrRzPRdvGSPh+QH1MPP0ZoRYs3nF1UGW1aoFQ= -go.skia.org/infra v0.0.0-20211111154509-8e43ef9acc1b/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM= -go.skia.org/infra v0.0.0-20211115132608-15374cc24841 h1:DCO1fLr8bVXYJJJUR1t1K1kjt4hMHQn85n4CZiSunE4= -go.skia.org/infra v0.0.0-20211115132608-15374cc24841/go.mod h1:BX7j5CR8GabRog5/v70hZ7QERcahOEUvzkDN/oBJSEM= go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5/go.mod h1:nmDLcffg48OtT/PSW0Hg7FvpRQsQh5OSqIylirxKC7o= go.starlark.net v0.0.0-20201118183435-e55f603d8c79 h1:JPjLPz44y2N9mkzh2N344kTk1Y4/V4yJAjTrXGmzv8I= go.starlark.net v0.0.0-20201118183435-e55f603d8c79/go.mod h1:5YFcFnRptTN+41758c2bMPiqpGg4zBfYji1IQz8wNFk= diff --git a/infra/bots/README.recipes.md b/infra/bots/README.recipes.md index adcfe05c4e..1f3cf5f0dd 100644 --- a/infra/bots/README.recipes.md +++ b/infra/bots/README.recipes.md @@ -55,7 +55,7 @@ [DEPS](/infra/bots/recipe_modules/build/__init__.py#7): [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [docker](#recipe_modules-docker), [env](#recipe_modules-env), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 Build Skia for various platforms. @@ -70,7 +70,7 @@ Compile the code. Copy selected build products to dst. ### *recipe_modules* / [builder\_name\_schema](/infra/bots/recipe_modules/builder_name_schema) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [BuilderNameSchemaApi](/infra/bots/recipe_modules/builder_name_schema/api.py#14)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -81,7 +81,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/checkout/__init__.py#7): [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/git][depot_tools/recipe_modules/git], [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [CheckoutApi](/infra/bots/recipe_modules/checkout/api.py#13)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -115,7 +115,7 @@ Run the steps to perform a pure-git checkout without DEPS. [DEPS](/infra/bots/recipe_modules/docker/__init__.py#8): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [env](#recipe_modules-env), [run](#recipe_modules-run) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [DockerApi](/infra/bots/recipe_modules/docker/api.py#15)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -128,7 +128,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/doxygen/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/step][recipe_engine/recipe_modules/step], [run](#recipe_modules-run) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [DoxygenApi](/infra/bots/recipe_modules/doxygen/api.py#9)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -137,14 +137,14 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/env/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context] -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [EnvApi](/infra/bots/recipe_modules/env/api.py#9)([RecipeApi][recipe_engine/wkt/RecipeApi]):** ### *recipe_modules* / [flavor](/infra/bots/recipe_modules/flavor) [DEPS](/infra/bots/recipe_modules/flavor/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [docker](#recipe_modules-docker), [env](#recipe_modules-env), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [SkiaFlavorApi](/infra/bots/recipe_modules/flavor/api.py#59)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -179,7 +179,7 @@ Return a flavor utils object specific to the given builder. [DEPS](/infra/bots/recipe_modules/git/__init__.py#7): [recipe\_engine/path][recipe_engine/recipe_modules/path], [env](#recipe_modules-env) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [GitApi](/infra/bots/recipe_modules/git/api.py#9)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -193,7 +193,7 @@ in the 'git' relative path. [DEPS](/infra/bots/recipe_modules/gold_upload/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [flavor](#recipe_modules-flavor), [gsutil](#recipe_modules-gsutil), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [GoldUploadApi](/infra/bots/recipe_modules/gold_upload/api.py#11)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -205,7 +205,7 @@ This module assumes setup has occurred for the vars and flavor modules. [DEPS](/infra/bots/recipe_modules/gsutil/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [GSUtilApi](/infra/bots/recipe_modules/gsutil/api.py#10)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -231,7 +231,7 @@ If the operation fails, it will be retried multiple times. [DEPS](/infra/bots/recipe_modules/infra/__init__.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/step][recipe_engine/recipe_modules/step], [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [InfraApi](/infra/bots/recipe_modules/infra/api.py#14)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -246,7 +246,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/run/__init__.py#7): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [env](#recipe_modules-env), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [SkiaStepApi](/infra/bots/recipe_modules/run/api.py#14)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -291,7 +291,7 @@ Convenience function for writing files. [DEPS](/infra/bots/recipe_modules/vars/__init__.py#7): [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [builder\_name\_schema](#recipe_modules-builder_name_schema) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 #### **class [SkiaVarsApi](/infra/bots/recipe_modules/vars/api.py#16)([RecipeApi][recipe_engine/wkt/RecipeApi]):** @@ -310,42 +310,42 @@ Prepare the variables. [DEPS](/infra/bots/recipe_modules/build/examples/full.py#7): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [build](#recipe_modules-build), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/build/examples/full.py#18)(api):** ### *recipes* / [builder\_name\_schema:examples/full](/infra/bots/recipe_modules/builder_name_schema/examples/full.py) [DEPS](/infra/bots/recipe_modules/builder_name_schema/examples/full.py#7): [builder\_name\_schema](#recipe_modules-builder_name_schema) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/builder_name_schema/examples/full.py#12)(api):** ### *recipes* / [check\_generated\_files](/infra/bots/recipes/check_generated_files.py) [DEPS](/infra/bots/recipes/check_generated_files.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [build](#recipe_modules-build), [checkout](#recipe_modules-checkout), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/check_generated_files.py#26)(api):** ### *recipes* / [checkout:examples/full](/infra/bots/recipe_modules/checkout/examples/full.py) [DEPS](/infra/bots/recipe_modules/checkout/examples/full.py#7): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [checkout](#recipe_modules-checkout), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/checkout/examples/full.py#18)(api):** ### *recipes* / [compile](/infra/bots/recipes/compile.py) [DEPS](/infra/bots/recipes/compile.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [build](#recipe_modules-build), [checkout](#recipe_modules-checkout), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/compile.py#26)(api):** ### *recipes* / [compute\_buildstats](/infra/bots/recipes/compute_buildstats.py) [DEPS](/infra/bots/recipes/compute_buildstats.py#12): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [checkout](#recipe_modules-checkout), [env](#recipe_modules-env), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/compute_buildstats.py#35)(api):** @@ -366,28 +366,28 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/docker/examples/full.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [docker](#recipe_modules-docker), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/docker/examples/full.py#16)(api):** ### *recipes* / [doxygen:examples/full](/infra/bots/recipe_modules/doxygen/examples/full.py) [DEPS](/infra/bots/recipe_modules/doxygen/examples/full.py#7): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [doxygen](#recipe_modules-doxygen), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/doxygen/examples/full.py#15)(api):** ### *recipes* / [env:examples/full](/infra/bots/recipe_modules/env/examples/full.py) [DEPS](/infra/bots/recipe_modules/env/examples/full.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/step][recipe_engine/recipe_modules/step], [env](#recipe_modules-env) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/env/examples/full.py#14)(api):** ### *recipes* / [flavor:examples/full](/infra/bots/recipe_modules/flavor/examples/full.py) [DEPS](/infra/bots/recipe_modules/flavor/examples/full.py#7): [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/flavor/examples/full.py#32)(api):** @@ -396,35 +396,35 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/git/examples/full.py#7): [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/step][recipe_engine/recipe_modules/step], [git](#recipe_modules-git) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/git/examples/full.py#14)(api):** ### *recipes* / [gold\_upload:examples/full](/infra/bots/recipe_modules/gold_upload/examples/full.py) [DEPS](/infra/bots/recipe_modules/gold_upload/examples/full.py#10): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [flavor](#recipe_modules-flavor), [gold\_upload](#recipe_modules-gold_upload), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/gold_upload/examples/full.py#22)(api):** ### *recipes* / [gsutil:examples/full](/infra/bots/recipe_modules/gsutil/examples/full.py) [DEPS](/infra/bots/recipe_modules/gsutil/examples/full.py#10): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [gsutil](#recipe_modules-gsutil), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/gsutil/examples/full.py#21)(api):** ### *recipes* / [housekeeper](/infra/bots/recipes/housekeeper.py) [DEPS](/infra/bots/recipes/housekeeper.py#13): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [checkout](#recipe_modules-checkout), [doxygen](#recipe_modules-doxygen), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/housekeeper.py#24)(api):** ### *recipes* / [infra](/infra/bots/recipes/infra.py) [DEPS](/infra/bots/recipes/infra.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [infra](#recipe_modules-infra), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/infra.py#28)(api):** @@ -433,14 +433,14 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipe_modules/infra/examples/full.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/infra/examples/full.py#23)(api):** ### *recipes* / [perf](/infra/bots/recipes/perf.py) [DEPS](/infra/bots/recipes/perf.py#15): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/perf.py#104)(api):** @@ -451,14 +451,14 @@ Run Skia benchmarks. [DEPS](/infra/bots/recipes/perf_pathkit.py#9): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [checkout](#recipe_modules-checkout), [docker](#recipe_modules-docker), [env](#recipe_modules-env), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/perf_pathkit.py#28)(api):** ### *recipes* / [perf\_skottietrace](/infra/bots/recipes/perf_skottietrace.py) [DEPS](/infra/bots/recipes/perf_skottietrace.py#17): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/perf_skottietrace.py#219)(api):** @@ -488,7 +488,7 @@ Run DM on lottie files with tracing turned on and then parse the output. [DEPS](/infra/bots/recipes/perf_skottiewasm_lottieweb.py#14): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [checkout](#recipe_modules-checkout), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/perf_skottiewasm_lottieweb.py#84)(api):** @@ -507,7 +507,7 @@ A dictionary is returned that has the following structure: [DEPS](/infra/bots/recipe_modules/run/examples/full.py#7): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/run/examples/full.py#22)(api):** @@ -516,7 +516,7 @@ PYTHON_VERSION_COMPATIBILITY: PY3 [DEPS](/infra/bots/recipes/skpbench.py#13): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/skpbench.py#163)(api):** @@ -527,14 +527,14 @@ benchmark Skia using skpbench. [DEPS](/infra/bots/recipes/sync_and_compile.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [build](#recipe_modules-build), [checkout](#recipe_modules-checkout), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/sync_and_compile.py#26)(api):** ### *recipes* / [test](/infra/bots/recipes/test.py) [DEPS](/infra/bots/recipes/test.py#13): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [gold\_upload](#recipe_modules-gold_upload), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/test.py#162)(api):** @@ -545,49 +545,49 @@ Run the DM test. [DEPS](/infra/bots/recipes/test_canvaskit.py#9): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [checkout](#recipe_modules-checkout), [docker](#recipe_modules-docker), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [gold\_upload](#recipe_modules-gold_upload), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/test_canvaskit.py#29)(api):** ### *recipes* / [test\_lottie\_web](/infra/bots/recipes/test_lottie_web.py) [DEPS](/infra/bots/recipes/test_lottie_web.py#9): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [checkout](#recipe_modules-checkout), [docker](#recipe_modules-docker), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [gold\_upload](#recipe_modules-gold_upload), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/test_lottie_web.py#29)(api):** ### *recipes* / [test\_pathkit](/infra/bots/recipes/test_pathkit.py) [DEPS](/infra/bots/recipes/test_pathkit.py#9): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/step][recipe_engine/recipe_modules/step], [checkout](#recipe_modules-checkout), [docker](#recipe_modules-docker), [env](#recipe_modules-env), [flavor](#recipe_modules-flavor), [gold\_upload](#recipe_modules-gold_upload), [infra](#recipe_modules-infra), [run](#recipe_modules-run), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/test_pathkit.py#30)(api):** ### *recipes* / [upload\_buildstats\_results](/infra/bots/recipes/upload_buildstats_results.py) [DEPS](/infra/bots/recipes/upload_buildstats_results.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/upload_buildstats_results.py#21)(api):** ### *recipes* / [upload\_dm\_results](/infra/bots/recipes/upload_dm_results.py) [DEPS](/infra/bots/recipes/upload_dm_results.py#13): [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [gsutil](#recipe_modules-gsutil), [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/upload_dm_results.py#29)(api):** ### *recipes* / [upload\_nano\_results](/infra/bots/recipes/upload_nano_results.py) [DEPS](/infra/bots/recipes/upload_nano_results.py#10): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipes/upload_nano_results.py#21)(api):** ### *recipes* / [vars:examples/full](/infra/bots/recipe_modules/vars/examples/full.py) [DEPS](/infra/bots/recipe_modules/vars/examples/full.py#7): [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step], [vars](#recipe_modules-vars) -PYTHON_VERSION_COMPATIBILITY: PY3 +PYTHON_VERSION_COMPATIBILITY: PY2+3 — **def [RunSteps](/infra/bots/recipe_modules/vars/examples/full.py#16)(api):** diff --git a/infra/bots/assets/clang_linux/create.py b/infra/bots/assets/clang_linux/create.py index cdcbd31ebe..9eba6e6766 100755 --- a/infra/bots/assets/clang_linux/create.py +++ b/infra/bots/assets/clang_linux/create.py @@ -42,8 +42,8 @@ def create_asset(target_dir): subprocess.check_call(["cp", "bin/llvm-symbolizer", target_dir + "/bin"]) subprocess.check_call(["cp", "bin/llvm-profdata", target_dir + "/bin"]) subprocess.check_call(["cp", "bin/llvm-cov", target_dir + "/bin"]) - libstdcpp = subprocess.check_output([ - "c++", "-print-file-name=libstdc++.so.6"]).decode('utf-8') + libstdcpp = subprocess.check_output(["c++", + "-print-file-name=libstdc++.so.6"]) subprocess.check_call(["cp", libstdcpp.strip(), target_dir + "/lib"]) # Finally, build libc++ for TSAN and MSAN bots using the Clang we just built. diff --git a/infra/bots/bundle_recipes.sh b/infra/bots/bundle_recipes.sh index 2c92ef3aec..ce13121791 100755 --- a/infra/bots/bundle_recipes.sh +++ b/infra/bots/bundle_recipes.sh @@ -6,10 +6,8 @@ set -x -e -which vpython3 -vpython3 --version cd skia git init git add . git commit -m "Commit Recipes" -vpython3 infra/bots/recipes.py bundle --destination ${1}/recipe_bundle +python infra/bots/recipes.py bundle --destination ${1}/recipe_bundle diff --git a/infra/bots/gen_tasks_logic/compile_cas.go b/infra/bots/gen_tasks_logic/compile_cas.go index 0c0fc6989a..70f53576f3 100644 --- a/infra/bots/gen_tasks_logic/compile_cas.go +++ b/infra/bots/gen_tasks_logic/compile_cas.go @@ -45,7 +45,6 @@ var ( explicitPaths = []string{ ".clang-format", ".clang-tidy", - ".vpython", "bin/fetch-clang-format", "bin/fetch-gn", "buildtools", diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go index 9f3bcb9176..fe2fd18c04 100644 --- a/infra/bots/gen_tasks_logic/gen_tasks_logic.go +++ b/infra/bots/gen_tasks_logic/gen_tasks_logic.go @@ -140,7 +140,6 @@ var ( CAS_SPEC_LOTTIE_CI = &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/lottiecap", "skia/tools/lottie-web-perf", @@ -404,7 +403,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_CANVASKIT, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/canvaskit", "skia/modules/canvaskit", @@ -418,7 +416,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_LOTTIE_WEB, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/tools/lottie-web-perf", }, @@ -427,7 +424,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_PATHKIT, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/pathkit", "skia/modules/pathkit", @@ -437,7 +433,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_PERF, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/platform_tools/ios/bin", @@ -449,7 +444,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_PUPPETEER, &specs.CasSpec{ Root: "../skia", // Needed for other repos. Paths: []string{ - ".vpython", "tools/perf-canvaskit-puppeteer", }, Excludes: []string{rbe.ExcludeGitDir}, @@ -469,7 +463,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_RUN_RECIPE, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", }, Excludes: []string{rbe.ExcludeGitDir}, @@ -477,7 +470,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_SKOTTIE_WASM, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/tools/skottie-wasm-perf", }, @@ -486,7 +478,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_SKPBENCH, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/tools/skpbench", @@ -497,7 +488,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_TASK_DRIVERS, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/go.mod", "skia/go.sum", "skia/infra/bots/build_task_drivers.sh", @@ -509,7 +499,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_TEST, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/platform_tools/ios/bin", @@ -521,7 +510,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_WASM_GM, &specs.CasSpec{ Root: "../skia", // Needed for other repos. Paths: []string{ - ".vpython", "resources", "tools/run-wasm-gm-tests", }, @@ -531,7 +519,6 @@ func GenTasks(cfg *Config) { b.MustAddCasSpec(CAS_RECREATE_SKPS, &specs.CasSpec{ Root: "..", Paths: []string{ - "skia/.vpython", "skia/DEPS", "skia/bin/fetch-sk", "skia/infra/bots/assets/skp", @@ -591,8 +578,6 @@ func marshalJson(data interface{}) string { func (b *taskBuilder) kitchenTaskNoBundle(recipe string, outputDir string) { b.cipd(CIPD_PKG_LUCI_AUTH) b.cipd(cipd.MustGetPackage("infra/tools/luci/kitchen/${platform}")) - b.env("RECIPES_USE_PY3", "true") - b.envPrefixes("VPYTHON_DEFAULT_SPEC", "skia/.vpython") b.usesPython() b.recipeProp("swarm_out_dir", outputDir) if outputDir != OUTPUT_NONE { @@ -991,12 +976,12 @@ func (b *taskBuilder) defaultSwarmDimensions() { func (b *jobBuilder) bundleRecipes() string { b.addTask(BUNDLE_RECIPES_NAME, func(b *taskBuilder) { b.cipd(specs.CIPD_PKGS_GIT_LINUX_AMD64...) + b.cipd(specs.CIPD_PKGS_PYTHON_LINUX_AMD64...) b.cmd("/bin/bash", "skia/infra/bots/bundle_recipes.sh", specs.PLACEHOLDER_ISOLATED_OUTDIR) b.linuxGceDimensions(MACHINE_TYPE_SMALL) + b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin") b.idempotent() b.cas(CAS_RECIPES) - b.usesPython() - b.addToPATH("cipd_bin_packages", "cipd_bin_packages/bin") }) return BUNDLE_RECIPES_NAME } @@ -1645,14 +1630,14 @@ func (b *jobBuilder) fm() { // Point sanitizer builds at our prebuilt libc++ for this sanitizer. if b.extraConfig("MSAN") { // We'd see false positives in std::basic_string if this weren't set. - b.envPrefixes("LD_LIBRARY_PATH", "clang_linux/msan") + b.env("LD_LIBRARY_PATH", "clang_linux/msan") } else if b.extraConfig("TSAN") { // Occasional false positives may crop up in the standard library without this. - b.envPrefixes("LD_LIBRARY_PATH", "clang_linux/tsan") + b.env("LD_LIBRARY_PATH", "clang_linux/tsan") } else { // This isn't strictly required, but we usually get better sanitizer // diagnostics from libc++ than the default OS-provided libstdc++. - b.envPrefixes("LD_LIBRARY_PATH", "clang_linux/lib") + b.env("LD_LIBRARY_PATH", "clang_linux/lib") } } }) @@ -1913,7 +1898,7 @@ func (b *jobBuilder) presubmit() { b.cipd(&specs.CipdPackage{ Name: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build", Path: "recipe_bundle", - Version: "git_revision:1a28cb094add070f4beefd052725223930d8c27a", + Version: "git_revision:a8bcedad6768e206c4d2bd1718caa849f29cd42d", }) }) } diff --git a/infra/bots/gen_tasks_logic/task_builder.go b/infra/bots/gen_tasks_logic/task_builder.go index 1f00ccc784..06b8d220e7 100644 --- a/infra/bots/gen_tasks_logic/task_builder.go +++ b/infra/bots/gen_tasks_logic/task_builder.go @@ -90,17 +90,8 @@ func (b *taskBuilder) cas(casSpec string) { b.Spec.CasSpec = casSpec } -// env sets the value for the given environment variable for the task. -func (b *taskBuilder) env(key, value string) { - if b.Spec.Environment == nil { - b.Spec.Environment = map[string]string{} - } - b.Spec.Environment[key] = value -} - -// envPrefixes appends the given values to the given environment variable for -// the task. -func (b *taskBuilder) envPrefixes(key string, values ...string) { +// env appends the given values to the given environment variable for the task. +func (b *taskBuilder) env(key string, values ...string) { if b.Spec.EnvPrefixes == nil { b.Spec.EnvPrefixes = map[string][]string{} } @@ -113,7 +104,7 @@ func (b *taskBuilder) envPrefixes(key string, values ...string) { // addToPATH adds the given locations to PATH for the task. func (b *taskBuilder) addToPATH(loc ...string) { - b.envPrefixes("PATH", loc...) + b.env("PATH", loc...) } // output adds the given paths as outputs to the task, which results in their @@ -227,7 +218,7 @@ func (b *taskBuilder) usesGo() { } b.cipd(pkg) b.addToPATH(pkg.Path + "/go/bin") - b.envPrefixes("GOROOT", pkg.Path+"/go") + b.env("GOROOT", pkg.Path+"/go") } // usesDocker adds attributes to tasks which use docker. @@ -312,7 +303,7 @@ func (b *taskBuilder) usesPython() { Name: "vpython", Path: "cache/vpython", }) - b.envPrefixes("VPYTHON_VIRTUALENV_ROOT", "cache/vpython") + b.env("VPYTHON_VIRTUALENV_ROOT", "cache/vpython") b.env("VPYTHON_LOG_TRACE", "1") } diff --git a/infra/bots/git_utils.py b/infra/bots/git_utils.py index d74136a990..668f99afd3 100755 --- a/infra/bots/git_utils.py +++ b/infra/bots/git_utils.py @@ -23,8 +23,7 @@ class GitLocalConfig(object): def __enter__(self): for k, v in self._config_dict.items(): try: - prev = subprocess.check_output([ - 'git', 'config', '--local', k]).decode('utf-8').rstrip() + prev = subprocess.check_output(['git', 'config', '--local', k]).rstrip() if prev: self._previous_values[k] = prev except subprocess.CalledProcessError: @@ -61,8 +60,7 @@ class GitBranch(object): def __enter__(self): subprocess.check_call(['git', 'reset', '--hard', 'HEAD']) subprocess.check_call(['git', 'checkout', 'main']) - if self._branch_name in subprocess.check_output([ - 'git', 'branch']).decode('utf-8').split(): + if self._branch_name in subprocess.check_output(['git', 'branch']).split(): subprocess.check_call(['git', 'branch', '-D', self._branch_name]) subprocess.check_call(['git', 'checkout', '-b', self._branch_name, '-t', 'origin/main']) @@ -83,8 +81,7 @@ class GitBranch(object): if self._cc_list: upload_cmd.extend(['--cc=%s' % ','.join(self._cc_list)]) subprocess.check_call(upload_cmd) - output = subprocess.check_output([ - 'git', 'cl', 'issue']).decode('utf-8').rstrip() + output = subprocess.check_output(['git', 'cl', 'issue']).rstrip() return re.match('^Issue number: (?P\d+) \((?P.+)\)$', output).group('issue_url') @@ -148,7 +145,7 @@ class NewGitCheckout(utils.tmp_dir): remote = self._repository if self._local: remote = self._local - subprocess.check_call(['git', 'clone', remote]) + subprocess.check_output(args=['git', 'clone', remote]) repo_name = remote.split('/')[-1] if repo_name.endswith('.git'): repo_name = repo_name[:-len('.git')] diff --git a/infra/bots/recipe_modules/build/__init__.py b/infra/bots/recipe_modules/build/__init__.py index 5ca95b4f59..6bcc38b84e 100644 --- a/infra/bots/recipe_modules/build/__init__.py +++ b/infra/bots/recipe_modules/build/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'depot_tools/gclient', diff --git a/infra/bots/recipe_modules/build/examples/full.py b/infra/bots/recipe_modules/build/examples/full.py index dc2ae8f553..95dc54c5f6 100644 --- a/infra/bots/recipe_modules/build/examples/full.py +++ b/infra/bots/recipe_modules/build/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'build', diff --git a/infra/bots/recipe_modules/builder_name_schema/__init__.py b/infra/bots/recipe_modules/builder_name_schema/__init__.py index c239b782cd..bc2963a0cc 100644 --- a/infra/bots/recipe_modules/builder_name_schema/__init__.py +++ b/infra/bots/recipe_modules/builder_name_schema/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ ] diff --git a/infra/bots/recipe_modules/builder_name_schema/examples/full.py b/infra/bots/recipe_modules/builder_name_schema/examples/full.py index fd49a0cfc6..9e540383c2 100644 --- a/infra/bots/recipe_modules/builder_name_schema/examples/full.py +++ b/infra/bots/recipe_modules/builder_name_schema/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'builder_name_schema', diff --git a/infra/bots/recipe_modules/checkout/__init__.py b/infra/bots/recipe_modules/checkout/__init__.py index 030bc371b6..45d0f16f1a 100644 --- a/infra/bots/recipe_modules/checkout/__init__.py +++ b/infra/bots/recipe_modules/checkout/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'depot_tools/bot_update', diff --git a/infra/bots/recipe_modules/checkout/api.py b/infra/bots/recipe_modules/checkout/api.py index 5822642681..0a6e686ee5 100644 --- a/infra/bots/recipe_modules/checkout/api.py +++ b/infra/bots/recipe_modules/checkout/api.py @@ -25,7 +25,7 @@ import subprocess import sys which = 'where' if sys.platform == 'win32' else 'which' -git = subprocess.check_output([which, 'git']).decode('utf-8') +git = subprocess.check_output([which, 'git']) print('git was found at %s' % git) if 'cipd_bin_packages' not in git: print('Git must be obtained through CIPD.', file=sys.stderr) diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json index e6aa96571c..219f18661f 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Debian10-Clang-x86_64-Release-NoDEPS.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 960d5503cf..76c04079a5 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json index 2ca9f84870..f90dd0ff24 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json index e90898df3b..e48c51eade 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/cross_repo_trybot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json index e902ea6356..5a1ad964a8 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/flutter_trybot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json b/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json index c75a88b2d7..5ab0f28f1d 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json +++ b/infra/bots/recipe_modules/checkout/examples/full.expected/trybot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipe_modules/checkout/examples/full.py b/infra/bots/recipe_modules/checkout/examples/full.py index c695181fe4..e4f07152b3 100644 --- a/infra/bots/recipe_modules/checkout/examples/full.py +++ b/infra/bots/recipe_modules/checkout/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipe_modules/docker/__init__.py b/infra/bots/recipe_modules/docker/__init__.py index 68f28c5ebd..2e61ccb013 100644 --- a/infra/bots/recipe_modules/docker/__init__.py +++ b/infra/bots/recipe_modules/docker/__init__.py @@ -3,7 +3,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipe_modules/docker/examples/full.py b/infra/bots/recipe_modules/docker/examples/full.py index 5885ab2954..a9cc88b5c7 100644 --- a/infra/bots/recipe_modules/docker/examples/full.py +++ b/infra/bots/recipe_modules/docker/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'docker', diff --git a/infra/bots/recipe_modules/doxygen/__init__.py b/infra/bots/recipe_modules/doxygen/__init__.py index fceee85a78..9555f07e15 100644 --- a/infra/bots/recipe_modules/doxygen/__init__.py +++ b/infra/bots/recipe_modules/doxygen/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipe_modules/doxygen/examples/full.py b/infra/bots/recipe_modules/doxygen/examples/full.py index 51d8bd51bb..e27b2d3fd6 100644 --- a/infra/bots/recipe_modules/doxygen/examples/full.py +++ b/infra/bots/recipe_modules/doxygen/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'doxygen', diff --git a/infra/bots/recipe_modules/env/__init__.py b/infra/bots/recipe_modules/env/__init__.py index 2050f30e52..a52348569a 100644 --- a/infra/bots/recipe_modules/env/__init__.py +++ b/infra/bots/recipe_modules/env/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipe_modules/env/examples/full.py b/infra/bots/recipe_modules/env/examples/full.py index 20f9625c24..47ef9f14f6 100644 --- a/infra/bots/recipe_modules/env/examples/full.py +++ b/infra/bots/recipe_modules/env/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipe_modules/flavor/__init__.py b/infra/bots/recipe_modules/flavor/__init__.py index ab8557bde4..ce8d518df1 100644 --- a/infra/bots/recipe_modules/flavor/__init__.py +++ b/infra/bots/recipe_modules/flavor/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'docker', diff --git a/infra/bots/recipe_modules/flavor/android.py b/infra/bots/recipe_modules/flavor/android.py index 34765d256a..a56094c6c7 100644 --- a/infra/bots/recipe_modules/flavor/android.py +++ b/infra/bots/recipe_modules/flavor/android.py @@ -166,37 +166,37 @@ ADB = sys.argv[1] freq = sys.argv[2] idle_timer = "10000" -log = subprocess.check_output([ADB, 'root']).decode('utf-8') +log = subprocess.check_output([ADB, 'root']) # check for message like 'adbd cannot run as root in production builds' print(log) if 'cannot' in log: raise Exception('adb root failed') -subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8') +subprocess.check_output([ADB, 'shell', 'stop', 'thermald']) subprocess.check_output([ADB, 'shell', 'echo "%s" > ' - '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8') + '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]) actual_freq = subprocess.check_output([ADB, 'shell', 'cat ' - '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip() + '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip() if actual_freq != freq: raise Exception('Frequency (actual, expected) (%s, %s)' % (actual_freq, freq)) -subprocess.check_call([ADB, 'shell', 'echo "%s" > ' +subprocess.check_output([ADB, 'shell', 'echo "%s" > ' '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer]) actual_timer = subprocess.check_output([ADB, 'shell', 'cat ' - '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip() + '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip() if actual_timer != idle_timer: raise Exception('idle_timer (actual, expected) (%s, %s)' % (actual_timer, idle_timer)) for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']: - subprocess.check_call([ADB, 'shell', 'echo "1" > ' + subprocess.check_output([ADB, 'shell', 'echo "1" > ' '/sys/class/kgsl/kgsl-3d0/%s' % s]) actual_set = subprocess.check_output([ADB, 'shell', 'cat ' - '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip() + '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip() if actual_set != "1": raise Exception('%s (actual, expected) (%s, 1)' % (s, actual_set)) @@ -219,19 +219,16 @@ ADB = sys.argv[1] cpu = int(sys.argv[2]) gov = sys.argv[3] -log = subprocess.check_output([ADB, 'root']).decode('utf-8') +log = subprocess.check_output([ADB, 'root']) # check for message like 'adbd cannot run as root in production builds' print(log) if 'cannot' in log: raise Exception('adb root failed') -subprocess.check_output([ - ADB, 'shell', - 'echo "%s" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % ( - gov, cpu)]).decode('utf-8') -actual_gov = subprocess.check_output([ - ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % - cpu]).decode('utf-8').strip() +subprocess.check_output([ADB, 'shell', 'echo "%s" > ' + '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)]) +actual_gov = subprocess.check_output([ADB, 'shell', 'cat ' + '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip() if actual_gov != gov: raise Exception('(actual, expected) (%s, %s)' % (actual_gov, gov)) @@ -259,7 +256,7 @@ ADB = sys.argv[1] cpu = int(sys.argv[2]) value = int(sys.argv[3]) -log = subprocess.check_output([ADB, 'root']).decode('utf-8') +log = subprocess.check_output([ADB, 'root']) # check for message like 'adbd cannot run as root in production builds' print(log) if 'cannot' in log: @@ -268,15 +265,15 @@ if 'cannot' in log: # If we try to echo 1 to an already online cpu, adb returns exit code 1. # So, check the value before trying to write it. prior_status = subprocess.check_output([ADB, 'shell', 'cat ' - '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip() + '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip() if prior_status == str(value): print('CPU %d online already %d' % (cpu, value)) sys.exit() -subprocess.check_call([ADB, 'shell', 'echo %s > ' +subprocess.check_output([ADB, 'shell', 'echo %s > ' '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)]) actual_status = subprocess.check_output([ADB, 'shell', 'cat ' - '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip() + '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip() if actual_status != str(value): raise Exception('(actual, expected) (%s, %d)' % (actual_status, value)) @@ -299,7 +296,7 @@ import time ADB = sys.argv[1] target_percent = float(sys.argv[2]) cpu = int(sys.argv[3]) -log = subprocess.check_output([ADB, 'root']).decode('utf-8') +log = subprocess.check_output([ADB, 'root']) # check for message like 'adbd cannot run as root in production builds' print(log) if 'cannot' in log: @@ -309,7 +306,7 @@ root = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu # All devices we test on give a list of their available frequencies. available_freqs = subprocess.check_output([ADB, 'shell', - 'cat %s/scaling_available_frequencies' % root]).decode('utf-8') + 'cat %s/scaling_available_frequencies' % root]) # Check for message like '/system/bin/sh: file not found' if available_freqs and '/system/bin/sh' not in available_freqs: @@ -333,15 +330,15 @@ print('Setting frequency to %d' % freq) # We must set min first, because if we try to set max to be less than min # (which sometimes happens after certain devices reboot) it returns a # perplexing permissions error. -subprocess.check_([ADB, 'shell', 'echo 0 > ' +subprocess.check_output([ADB, 'shell', 'echo 0 > ' '%s/scaling_min_freq' % root]) -subprocess.check_([ADB, 'shell', 'echo %d > ' +subprocess.check_output([ADB, 'shell', 'echo %d > ' '%s/scaling_max_freq' % (freq, root)]) -subprocess.check_([ADB, 'shell', 'echo %d > ' +subprocess.check_output([ADB, 'shell', 'echo %d > ' '%s/scaling_setspeed' % (freq, root)]) time.sleep(5) actual_freq = subprocess.check_output([ADB, 'shell', 'cat ' - '%s/scaling_cur_freq' % root]).decode('utf-8').strip() + '%s/scaling_cur_freq' % root]).strip() if actual_freq != str(freq): raise Exception('(actual, expected) (%s, %d)' % (actual_freq, freq)) @@ -381,33 +378,33 @@ def wait_for_device(): while True: time.sleep(5) print('Waiting for device') - subprocess.check_([ADB, 'wait-for-device']) + subprocess.check_output([ADB, 'wait-for-device']) bit1 = subprocess.check_output([ADB, 'shell', 'getprop', - 'dev.bootcomplete']).decode('utf-8') + 'dev.bootcomplete']) bit2 = subprocess.check_output([ADB, 'shell', 'getprop', - 'sys.boot_completed']).decode('utf-8') + 'sys.boot_completed']) if '1' in bit1 and '1' in bit2: print('Device detected') break -log = subprocess.check_output([ADB, 'root']).decode('utf-8') +log = subprocess.check_output([ADB, 'root']) # check for message like 'adbd cannot run as root in production builds' print(log) if 'cannot' in log: raise Exception('adb root failed') -output = subprocess.check_output([ADB, 'disable-verity']).decode('utf-8') +output = subprocess.check_output([ADB, 'disable-verity']) print(output) if 'already disabled' not in output: print('Rebooting device') - subprocess.check_call([ADB, 'reboot']) + subprocess.check_output([ADB, 'reboot']) wait_for_device() def installASAN(revert=False): # ASAN setup script is idempotent, either it installs it or # says it's installed. Returns True on success, false otherwise. - out = subprocess.check_output([ADB, 'wait-for-device']).decode('utf-8') + out = subprocess.check_output([ADB, 'wait-for-device']) print(out) cmd = [ASAN_SETUP] if revert: @@ -417,8 +414,8 @@ def installASAN(revert=False): # this also blocks until command finishes (stdout, stderr) = process.communicate() - print(stdout.decode('utf-8')) - print('Stderr: %s' % stderr.decode('utf-8')) + print(stdout) + print('Stderr: %s' % stderr) return process.returncode == 0 if not installASAN(): @@ -476,7 +473,7 @@ time.sleep(60) import subprocess import sys out = sys.argv[1] - log = subprocess.check_output(['%s', 'logcat', '-d']).decode('utf-8') + log = subprocess.check_output(['%s', 'logcat', '-d']) for line in log.split('\\n'): tokens = line.split() if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc': @@ -484,8 +481,7 @@ time.sleep(60) local = os.path.join(out, os.path.basename(path)) if os.path.exists(local): try: - sym = subprocess.check_output([ - 'addr2line', '-Cfpe', local, addr]).decode('utf-8') + sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr]) line = line.replace(addr, addr + ' ' + sym.strip()) except subprocess.CalledProcessError: pass @@ -530,8 +526,8 @@ time.sleep(60) sh = sys.argv[2] subprocess.check_call(['%s', 'shell', 'sh', bin_dir + sh]) try: - sys.exit(int(subprocess.check_output([ - '%s', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8'))) + sys.exit(int(subprocess.check_output(['%s', 'shell', 'cat', + bin_dir + 'rc']))) except ValueError: print("Couldn't read the return code. Probably killed for OOM.") sys.exit(1) @@ -586,10 +582,9 @@ time.sleep(60) cmd = [adb, 'shell', 'ls', path] print(' '.join(cmd)) try: - output = subprocess.check_output( - cmd, stderr=subprocess.STDOUT).decode('utf-8') + output = subprocess.check_output(cmd, stderr=subprocess.STDOUT) except subprocess.CalledProcessError as e: - output = e.output.decode('utf-8') + output = e.output print('Output was:') print('======') print(output) diff --git a/infra/bots/recipe_modules/flavor/chromebook.py b/infra/bots/recipe_modules/flavor/chromebook.py index c8b6e6f3f6..b4528b3b3b 100644 --- a/infra/bots/recipe_modules/flavor/chromebook.py +++ b/infra/bots/recipe_modules/flavor/chromebook.py @@ -46,8 +46,7 @@ class ChromebookFlavor(ssh.SSHFlavor): import sys src = sys.argv[1] + '/*' dest = sys.argv[2] - print(subprocess.check_output( - 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8')) + print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True)) """, args=[src, dest], infra_step=True) def copy_directory_contents_to_device(self, host_path, device_path): diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index 29d7b34602..66a29384a4 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -288,7 +286,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -316,10 +314,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -333,7 +330,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -361,10 +358,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -499,7 +495,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -527,10 +523,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -544,7 +539,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -572,10 +567,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -710,7 +704,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -738,10 +732,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -755,7 +748,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -783,10 +776,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -918,7 +910,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -931,8 +923,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1020,7 +1012,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1036,7 +1028,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1044,8 +1036,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json index e71396a2a0..3b9d2a50f3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -321,7 +319,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -349,10 +347,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -366,7 +363,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -394,10 +391,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -532,7 +528,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -560,10 +556,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -577,7 +572,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -605,10 +600,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -743,7 +737,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -771,10 +765,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -788,7 +781,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -816,10 +809,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -951,7 +943,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -964,8 +956,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1053,7 +1045,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1069,7 +1061,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1077,8 +1069,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 949a15e099..d5109f03b3 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -304,7 +302,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -332,10 +330,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -349,7 +346,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -377,10 +374,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -515,7 +511,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -543,10 +539,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -560,7 +555,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -588,10 +583,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -726,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -754,10 +748,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -771,7 +764,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -799,10 +792,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -934,7 +926,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -947,8 +939,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1036,7 +1028,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1052,7 +1044,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1060,8 +1052,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json index 2036122cc1..00d70a546d 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NVIDIA_Shield-CPU-TegraX1-arm64-Release-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -268,7 +266,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" ], @@ -296,10 +294,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -313,7 +310,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/text_blob_traces" ], @@ -341,10 +338,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -515,7 +511,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -543,10 +539,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -560,7 +555,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -588,10 +583,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -726,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -754,10 +748,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -771,7 +764,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -799,10 +792,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -937,7 +929,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -965,10 +957,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -982,7 +973,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1010,10 +1001,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1145,7 +1135,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1158,8 +1148,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1247,7 +1237,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1263,7 +1253,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1271,8 +1261,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 17d0ebbc8a..a4b7f5e619 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -319,7 +314,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -350,15 +345,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -369,7 +364,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -391,7 +386,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -400,15 +395,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -419,7 +414,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -441,7 +436,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -469,7 +464,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -491,7 +486,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -500,15 +495,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -519,7 +514,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_call([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_call([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald'])\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_output([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", "/opt/infra-android/tools/adb", "600000000" ], @@ -540,37 +535,37 @@ "@@@STEP_LOG_LINE@python.inline@freq = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@idle_timer = \"10000\"@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald'])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != freq:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('Frequency (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_timer = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_timer != idle_timer:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('idle_timer (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_timer, idle_timer))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'shell', 'echo \"1\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'shell', 'echo \"1\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s])@@@", "@@@STEP_LOG_LINE@python.inline@ actual_set = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@ if actual_set != \"1\":@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s (actual, expected) (%s, 1)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (s, actual_set))@@@", @@ -685,7 +680,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -713,10 +708,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -730,7 +724,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -758,10 +752,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -896,7 +889,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -924,10 +917,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -941,7 +933,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -969,10 +961,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1107,7 +1098,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1135,10 +1126,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1152,7 +1142,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1180,10 +1170,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1315,7 +1304,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1328,8 +1317,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1417,7 +1406,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1433,7 +1422,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1441,8 +1430,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json index d5fb1ced59..92801f9198 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -319,7 +314,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -350,15 +345,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -369,7 +364,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -391,7 +386,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -400,15 +395,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -419,7 +414,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -441,7 +436,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -469,7 +464,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -491,7 +486,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -500,15 +495,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -587,7 +582,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/MSKP_VERSION" ], @@ -615,10 +610,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -632,7 +626,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/mskp" ], @@ -660,10 +654,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -795,7 +788,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -808,8 +801,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -897,7 +890,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -913,7 +906,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -921,8 +914,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json index cd8551fede..506e0078b0 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json @@ -250,7 +250,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skia/resources", "foo@127.0.0.1:/home/chronos/user/resources" ], @@ -262,8 +262,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -382,7 +381,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skp", "foo@127.0.0.1:/home/chronos/user/skps" ], @@ -394,8 +393,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -527,7 +525,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skimage", "foo@127.0.0.1:/home/chronos/user/images" ], @@ -539,8 +537,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -672,7 +669,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/svg", "foo@127.0.0.1:/home/chronos/user/svgs" ], @@ -684,8 +681,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -724,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "foo@127.0.0.1:/home/chronos/user/perf", "[START_DIR]/[SWARM_OUT_DIR]" ], @@ -736,8 +732,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json index 9f5667b476..328c0e9dcb 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "hotplug" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -349,7 +344,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -377,10 +372,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -394,7 +388,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -422,10 +416,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -560,7 +553,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -588,10 +581,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -605,7 +597,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -633,10 +625,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -771,7 +762,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -799,10 +790,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -816,7 +806,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -844,10 +834,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -979,7 +968,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -992,8 +981,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1081,7 +1070,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1097,7 +1086,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1105,8 +1094,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json index 09ed1d6a0b..b8515ebc49 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-GalaxyS7_G930FD-GPU-MaliT880-arm64-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -304,7 +302,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -332,10 +330,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -349,7 +346,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -377,10 +374,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -515,7 +511,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -543,10 +539,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -560,7 +555,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -588,10 +583,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -726,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -754,10 +748,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -771,7 +764,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -799,10 +792,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -934,7 +926,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -947,8 +939,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1036,7 +1028,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1052,7 +1044,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1060,8 +1052,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json index 05e0a59eb1..87f0b9a3df 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "1" @@ -222,7 +220,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -231,15 +229,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -250,7 +248,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "1" @@ -272,7 +270,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -281,15 +279,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -300,7 +298,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "1" @@ -322,7 +320,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -331,15 +329,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -350,7 +348,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "1" @@ -372,7 +370,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -381,15 +379,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -400,7 +398,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "ondemand" @@ -422,19 +420,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -445,7 +440,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "ondemand" @@ -467,19 +462,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -594,7 +586,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -622,10 +614,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -639,7 +630,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -667,10 +658,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -805,7 +795,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -833,10 +823,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -850,7 +839,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -878,10 +867,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1016,7 +1004,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1044,10 +1032,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1061,7 +1048,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1089,10 +1076,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1224,7 +1210,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -1237,8 +1223,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1326,7 +1312,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1342,7 +1328,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1350,8 +1336,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json index c0d95de7c0..9ec8b8caea 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Nexus5x-GPU-Adreno418-arm64-Release-All-Android_ASAN.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print('Waiting for device')\n subprocess.check_([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete']).decode('utf-8')\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed']).decode('utf-8')\n if '1' in bit1 and '1' in bit2:\n print('Device detected')\n break\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity']).decode('utf-8')\nprint(output)\n\nif 'already disabled' not in output:\n print('Rebooting device')\n subprocess.check_call([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device']).decode('utf-8')\n print(out)\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print(stdout.decode('utf-8'))\n print('Stderr: %s' % stderr.decode('utf-8'))\n return process.returncode == 0\n\nif not installASAN():\n print('Trying to revert the ASAN install and then re-install')\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n# Sleep again to hopefully avoid error \"secure_mkdirs failed: No such file or\n# directory\" when pushing resources to the device.\ntime.sleep(60)\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print('Waiting for device')\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print('Device detected')\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint(output)\n\nif 'already disabled' not in output:\n print('Rebooting device')\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device'])\n print(out)\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print(stdout)\n print('Stderr: %s' % stderr)\n return process.returncode == 0\n\nif not installASAN():\n print('Trying to revert the ASAN install and then re-install')\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n# Sleep again to hopefully avoid error \"secure_mkdirs failed: No such file or\n# directory\" when pushing resources to the device.\ntime.sleep(60)\n", "/opt/infra-android/tools/adb", "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/bin/asan_device_setup" ], @@ -224,33 +222,33 @@ "@@@STEP_LOG_LINE@python.inline@ while True:@@@", "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@ print('Waiting for device')@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_([ADB, 'wait-for-device'])@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'wait-for-device'])@@@", "@@@STEP_LOG_LINE@python.inline@ bit1 = subprocess.check_output([ADB, 'shell', 'getprop',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'dev.bootcomplete']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'dev.bootcomplete'])@@@", "@@@STEP_LOG_LINE@python.inline@ bit2 = subprocess.check_output([ADB, 'shell', 'getprop',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'sys.boot_completed']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'sys.boot_completed'])@@@", "@@@STEP_LOG_LINE@python.inline@ if '1' in bit1 and '1' in bit2:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Device detected')@@@", "@@@STEP_LOG_LINE@python.inline@ break@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'disable-verity']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'disable-verity'])@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@if 'already disabled' not in output:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Rebooting device')@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'reboot'])@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'reboot'])@@@", "@@@STEP_LOG_LINE@python.inline@ wait_for_device()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@def installASAN(revert=False):@@@", "@@@STEP_LOG_LINE@python.inline@ # ASAN setup script is idempotent, either it installs it or@@@", "@@@STEP_LOG_LINE@python.inline@ # says it's installed. Returns True on success, false otherwise.@@@", - "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device'])@@@", "@@@STEP_LOG_LINE@python.inline@ print(out)@@@", "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP]@@@", "@@@STEP_LOG_LINE@python.inline@ if revert:@@@", @@ -260,8 +258,8 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@ # this also blocks until command finishes@@@", "@@@STEP_LOG_LINE@python.inline@ (stdout, stderr) = process.communicate()@@@", - "@@@STEP_LOG_LINE@python.inline@ print(stdout.decode('utf-8'))@@@", - "@@@STEP_LOG_LINE@python.inline@ print('Stderr: %s' % stderr.decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@ print(stdout)@@@", + "@@@STEP_LOG_LINE@python.inline@ print('Stderr: %s' % stderr)@@@", "@@@STEP_LOG_LINE@python.inline@ return process.returncode == 0@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@if not installASAN():@@@", @@ -290,7 +288,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "1" @@ -312,7 +310,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -321,15 +319,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -340,7 +338,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "1" @@ -362,7 +360,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -371,15 +369,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -390,7 +388,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "1" @@ -412,7 +410,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -421,15 +419,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -440,7 +438,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "1" @@ -462,7 +460,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -471,15 +469,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -490,7 +488,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "ondemand" @@ -512,19 +510,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -535,7 +530,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "ondemand" @@ -557,19 +552,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -684,7 +676,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -712,10 +704,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -729,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -757,10 +748,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -895,7 +885,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -923,10 +913,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -940,7 +929,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -968,10 +957,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1106,7 +1094,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1134,10 +1122,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1151,7 +1138,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1179,10 +1166,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1314,7 +1300,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -1327,8 +1313,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1442,7 +1428,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1458,7 +1444,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1466,8 +1452,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json index 9d66aab833..3a21c9a9d2 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Android-Clang-Pixel3a-GPU-Adreno615-arm64-Debug-All-Android_Vulkan.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "performance" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -349,7 +344,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -377,10 +372,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -394,7 +388,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -422,10 +416,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -560,7 +553,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -588,10 +581,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -605,7 +597,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -633,10 +625,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -771,7 +762,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -799,10 +790,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -816,7 +806,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -844,10 +834,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -979,7 +968,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -992,8 +981,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1081,7 +1070,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1097,7 +1086,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1105,8 +1094,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json index 8c9f90b70b..61027f8ed4 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-ChromeOS-Clang-SamsungChromebookPlus-GPU-MaliT860-arm-Release-All.json @@ -250,7 +250,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skia/resources", "foo@127.0.0.1:/home/chronos/user/resources" ], @@ -262,8 +262,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -382,7 +381,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skp", "foo@127.0.0.1:/home/chronos/user/skps" ], @@ -394,8 +393,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -527,7 +525,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/skimage", "foo@127.0.0.1:/home/chronos/user/images" ], @@ -539,8 +537,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -672,7 +669,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "[START_DIR]/svg", "foo@127.0.0.1:/home/chronos/user/svgs" ], @@ -684,8 +681,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, @@ -724,7 +720,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output(\n 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))\n", + "\nimport subprocess\nimport sys\nsrc = sys.argv[1] + '/*'\ndest = sys.argv[2]\nprint(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))\n", "foo@127.0.0.1:/home/chronos/user/dm_out", "[START_DIR]/[SWARM_OUT_DIR]" ], @@ -736,8 +732,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@src = sys.argv[1] + '/*'@@@", "@@@STEP_LOG_LINE@python.inline@dest = sys.argv[2]@@@", - "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ 'scp -r %s %s' % (src, dest), shell=True).decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@print(subprocess.check_output('scp -r %s %s' % (src, dest), shell=True))@@@", "@@@STEP_LOG_END@python.inline@@@" ] }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json index 37e4c3a676..c58393c359 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/usr/bin/adb.1.0.35", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -320,7 +315,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/usr/bin/adb.1.0.35", "0.6", "4" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -351,7 +346,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -375,15 +370,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -395,7 +390,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/usr/bin/adb.1.0.35", "0.6", "4" @@ -416,7 +411,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -426,7 +421,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -470,7 +465,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -486,7 +481,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -494,8 +489,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json index d8cddacda0..d7c74bb96e 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_golo.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -320,7 +315,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -351,7 +346,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -375,15 +370,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -395,7 +390,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -416,7 +411,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -426,7 +421,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -470,7 +465,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -486,7 +481,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -494,8 +489,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json index c0b3852f3c..6eafd82af2 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/cpu_scale_failed_once.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -320,7 +315,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -351,7 +346,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -375,15 +370,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -394,7 +389,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -416,7 +411,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -425,15 +420,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -444,7 +439,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -466,7 +461,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -475,15 +470,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -494,7 +489,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -516,7 +511,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -525,15 +520,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -544,7 +539,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -566,7 +561,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -575,15 +570,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -594,7 +589,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_call([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_call([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald'])\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_output([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", "/opt/infra-android/tools/adb", "600000000" ], @@ -615,37 +610,37 @@ "@@@STEP_LOG_LINE@python.inline@freq = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@idle_timer = \"10000\"@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald'])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != freq:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('Frequency (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_timer = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_timer != idle_timer:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('idle_timer (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_timer, idle_timer))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'shell', 'echo \"1\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'shell', 'echo \"1\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s])@@@", "@@@STEP_LOG_LINE@python.inline@ actual_set = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@ if actual_set != \"1\":@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s (actual, expected) (%s, 1)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (s, actual_set))@@@", @@ -760,7 +755,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -788,10 +783,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -805,7 +799,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -833,10 +827,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -971,7 +964,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -999,10 +992,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1016,7 +1008,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -1044,10 +1036,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1182,7 +1173,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1210,10 +1201,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1227,7 +1217,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1255,10 +1245,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1390,7 +1379,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1403,8 +1392,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1492,7 +1481,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1508,7 +1497,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1516,8 +1505,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json index 7f1b645888..d50b2ce29c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_infra_step.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -319,7 +314,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -350,15 +345,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -369,7 +364,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -391,7 +386,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -400,15 +395,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -419,7 +414,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -441,7 +436,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -469,7 +464,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -491,7 +486,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -500,15 +495,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -519,7 +514,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_call([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_call([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald'])\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_output([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", "/opt/infra-android/tools/adb", "600000000" ], @@ -540,37 +535,37 @@ "@@@STEP_LOG_LINE@python.inline@freq = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@idle_timer = \"10000\"@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald'])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != freq:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('Frequency (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_timer = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_timer != idle_timer:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('idle_timer (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_timer, idle_timer))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'shell', 'echo \"1\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'shell', 'echo \"1\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s])@@@", "@@@STEP_LOG_LINE@python.inline@ actual_set = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@ if actual_set != \"1\":@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s (actual, expected) (%s, 1)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (s, actual_set))@@@", @@ -685,7 +680,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -713,10 +708,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -730,7 +724,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -758,10 +752,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -896,7 +889,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -924,10 +917,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -941,7 +933,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -969,10 +961,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1107,7 +1098,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1135,10 +1126,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1152,7 +1142,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1180,10 +1170,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1315,7 +1304,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1328,8 +1317,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1417,7 +1406,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1433,7 +1422,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1441,8 +1430,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json index 5e176592f3..2f6b145776 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/failed_read_version.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -200,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -222,19 +220,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -245,7 +240,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -266,7 +261,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -276,7 +271,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -300,15 +295,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -319,7 +314,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -341,7 +336,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -350,15 +345,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -369,7 +364,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -391,7 +386,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -400,15 +395,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -419,7 +414,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -441,7 +436,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -469,7 +464,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -491,7 +486,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -500,15 +495,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -519,7 +514,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_call([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_call([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald'])\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_output([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", "/opt/infra-android/tools/adb", "600000000" ], @@ -540,37 +535,37 @@ "@@@STEP_LOG_LINE@python.inline@freq = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@idle_timer = \"10000\"@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald'])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != freq:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('Frequency (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_timer = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_timer != idle_timer:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('idle_timer (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_timer, idle_timer))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'shell', 'echo \"1\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'shell', 'echo \"1\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s])@@@", "@@@STEP_LOG_LINE@python.inline@ actual_set = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@ if actual_set != \"1\":@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s (actual, expected) (%s, 1)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (s, actual_set))@@@", @@ -685,7 +680,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -713,10 +708,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -730,7 +724,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -758,10 +752,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -945,7 +938,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -973,10 +966,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -990,7 +982,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -1018,10 +1010,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1156,7 +1147,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1184,10 +1175,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1201,7 +1191,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1229,10 +1219,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1364,7 +1353,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1377,8 +1366,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1466,7 +1455,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1482,7 +1471,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1490,8 +1479,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json index 292fdb2c63..7a5aa346e1 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -250,7 +248,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "4", "userspace" @@ -272,19 +270,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -295,7 +290,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/opt/infra-android/tools/adb", "0.6", "4" @@ -316,7 +311,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -326,7 +321,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -350,15 +345,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -369,7 +364,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "0", "0" @@ -391,7 +386,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -400,15 +395,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -419,7 +414,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "1", "0" @@ -441,7 +436,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -450,15 +445,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -469,7 +464,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "2", "0" @@ -491,7 +486,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -500,15 +495,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -519,7 +514,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/opt/infra-android/tools/adb", "3", "0" @@ -541,7 +536,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -550,15 +545,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -569,7 +564,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_call([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_call([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nfreq = sys.argv[2]\nidle_timer = \"10000\"\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'stop', 'thermald'])\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])\n\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()\nif actual_freq != freq:\n raise Exception('Frequency (actual, expected) (%s, %s)'\n % (actual_freq, freq))\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])\n\nactual_timer = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()\nif actual_timer != idle_timer:\n raise Exception('idle_timer (actual, expected) (%s, %s)'\n % (actual_timer, idle_timer))\n\nfor s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:\n subprocess.check_output([ADB, 'shell', 'echo \"1\" > '\n '/sys/class/kgsl/kgsl-3d0/%s' % s])\n actual_set = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()\n if actual_set != \"1\":\n raise Exception('%s (actual, expected) (%s, 1)'\n % (s, actual_set))\n", "/opt/infra-android/tools/adb", "600000000" ], @@ -590,37 +585,37 @@ "@@@STEP_LOG_LINE@python.inline@freq = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@idle_timer = \"10000\"@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'stop', 'thermald'])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk' % freq])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/gpuclk']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != freq:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('Frequency (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer' % idle_timer])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@actual_timer = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/idle_timer']).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_timer != idle_timer:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('idle_timer (actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_timer, idle_timer))@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@for s in ['force_bus_on', 'force_rail_on', 'force_clk_on']:@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'shell', 'echo \"1\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'shell', 'echo \"1\" > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s])@@@", "@@@STEP_LOG_LINE@python.inline@ actual_set = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/class/kgsl/kgsl-3d0/%s' % s]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@ if actual_set != \"1\":@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('%s (actual, expected) (%s, 1)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (s, actual_set))@@@", @@ -735,7 +730,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -763,10 +758,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -780,7 +774,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -808,10 +802,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -946,7 +939,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -974,10 +967,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -991,7 +983,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/images" ], @@ -1019,10 +1011,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1157,7 +1148,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -1185,10 +1176,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1202,7 +1192,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1230,10 +1220,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1365,7 +1354,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1378,8 +1367,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1467,7 +1456,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1483,7 +1472,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1491,8 +1480,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json index 3de1a60635..00f916f220 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/retry_adb_command_retries_exhausted.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "file.txt" ], @@ -76,10 +76,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -121,7 +120,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "device_results_dir" ], @@ -149,10 +148,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -303,7 +301,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -319,7 +317,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -327,8 +325,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipe_modules/flavor/examples/full.py b/infra/bots/recipe_modules/flavor/examples/full.py index ddfab4950f..8bba1e39f7 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.py +++ b/infra/bots/recipe_modules/flavor/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'flavor', diff --git a/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py b/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py index a7bbb44f34..51116a2708 100755 --- a/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py +++ b/infra/bots/recipe_modules/flavor/resources/symbolize_stack_trace.py @@ -77,8 +77,7 @@ def main(basedir, cmd): if not addr or not addr.startswith('0x'): addr = addr2 try: - sym = subprocess.check_output([ - 'addr2line', '-Cfpe', path, addr]).decode('utf-8') + sym = subprocess.check_output(['addr2line', '-Cfpe', path, addr]) except subprocess.CalledProcessError: sym = '' sym = sym.strip() diff --git a/infra/bots/recipe_modules/git/__init__.py b/infra/bots/recipe_modules/git/__init__.py index 6832955d24..afb192e85c 100644 --- a/infra/bots/recipe_modules/git/__init__.py +++ b/infra/bots/recipe_modules/git/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipe_modules/git/examples/full.py b/infra/bots/recipe_modules/git/examples/full.py index b5a0df821c..39ec7d1207 100644 --- a/infra/bots/recipe_modules/git/examples/full.py +++ b/infra/bots/recipe_modules/git/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'git', diff --git a/infra/bots/recipe_modules/gold_upload/__init__.py b/infra/bots/recipe_modules/gold_upload/__init__.py index dbfb028252..b0434588de 100644 --- a/infra/bots/recipe_modules/gold_upload/__init__.py +++ b/infra/bots/recipe_modules/gold_upload/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/json', diff --git a/infra/bots/recipe_modules/gold_upload/examples/full.py b/infra/bots/recipe_modules/gold_upload/examples/full.py index d9514e1042..5d54d55fd0 100644 --- a/infra/bots/recipe_modules/gold_upload/examples/full.py +++ b/infra/bots/recipe_modules/gold_upload/examples/full.py @@ -5,7 +5,7 @@ # Recipe which runs the Skia gold_upload tests. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'gold_upload', diff --git a/infra/bots/recipe_modules/gsutil/__init__.py b/infra/bots/recipe_modules/gsutil/__init__.py index 13570ef6bb..44d700e8f7 100644 --- a/infra/bots/recipe_modules/gsutil/__init__.py +++ b/infra/bots/recipe_modules/gsutil/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipe_modules/gsutil/examples/full.py b/infra/bots/recipe_modules/gsutil/examples/full.py index 9104c2053f..475cc786ab 100644 --- a/infra/bots/recipe_modules/gsutil/examples/full.py +++ b/infra/bots/recipe_modules/gsutil/examples/full.py @@ -5,7 +5,7 @@ # Recipe which runs the Skia gsutils tests. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'gsutil', diff --git a/infra/bots/recipe_modules/infra/__init__.py b/infra/bots/recipe_modules/infra/__init__.py index b414e88962..910eeb8eef 100644 --- a/infra/bots/recipe_modules/infra/__init__.py +++ b/infra/bots/recipe_modules/infra/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipe_modules/infra/examples/full.py b/infra/bots/recipe_modules/infra/examples/full.py index bb5d1086f5..87560ffec9 100644 --- a/infra/bots/recipe_modules/infra/examples/full.py +++ b/infra/bots/recipe_modules/infra/examples/full.py @@ -5,7 +5,7 @@ # Recipe which runs the Skia infra tests. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'infra', diff --git a/infra/bots/recipe_modules/run/__init__.py b/infra/bots/recipe_modules/run/__init__.py index ba095860b6..bd1942e87d 100644 --- a/infra/bots/recipe_modules/run/__init__.py +++ b/infra/bots/recipe_modules/run/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipe_modules/run/examples/full.py b/infra/bots/recipe_modules/run/examples/full.py index a76f715415..f53673e68a 100644 --- a/infra/bots/recipe_modules/run/examples/full.py +++ b/infra/bots/recipe_modules/run/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipe_modules/vars/__init__.py b/infra/bots/recipe_modules/vars/__init__.py index f19553a605..8b6323cfad 100644 --- a/infra/bots/recipe_modules/vars/__init__.py +++ b/infra/bots/recipe_modules/vars/__init__.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'builder_name_schema', diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py index a7ee6219f8..104bf0f871 100644 --- a/infra/bots/recipe_modules/vars/examples/full.py +++ b/infra/bots/recipe_modules/vars/examples/full.py @@ -2,7 +2,7 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/path', diff --git a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json index 08c6035a68..1ad72e82db 100644 --- a/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json +++ b/infra/bots/recipes/check_generated_files.expected/Housekeeper-PerCommit-CheckGeneratedFiles.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/check_generated_files.py b/infra/bots/recipes/check_generated_files.py index a4615d5b25..2b1d560c1a 100644 --- a/infra/bots/recipes/check_generated_files.py +++ b/infra/bots/recipes/check_generated_files.py @@ -5,7 +5,7 @@ # Recipe for the Skia PerCommit Housekeeper. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'build', diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json index 65125d6ef5..ecb71c3a83 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-x86-Debug.json @@ -100,7 +100,7 @@ "cmd": [ "vpython", "-u", - "\n# [VPYTHON:BEGIN]\n# wheel: <\n# name: \"infra/python/wheels/psutil/${vpython_platform}\"\n# version: \"version:5.8.0.chromium.2\"\n# >\n# [VPYTHON:END]\n\nimport psutil\nfor p in psutil.process_iter():\n try:\n if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):\n p.kill()\n except psutil._error.AccessDenied:\n pass\n" + "\n# [VPYTHON:BEGIN]\n# wheel: <\n# name: \"infra/python/wheels/psutil/${vpython_platform}\"\n# version: \"version:5.4.7\"\n# >\n# [VPYTHON:END]\n\nimport psutil\nfor p in psutil.process_iter():\n try:\n if p.name in ('mspdbsrv.exe', 'vctip.exe', 'cl.exe', 'link.exe'):\n p.kill()\n except psutil._error.AccessDenied:\n pass\n" ], "infra_step": true, "name": "cleanup", @@ -109,7 +109,7 @@ "@@@STEP_LOG_LINE@python.inline@# [VPYTHON:BEGIN]@@@", "@@@STEP_LOG_LINE@python.inline@# wheel: <@@@", "@@@STEP_LOG_LINE@python.inline@# name: \"infra/python/wheels/psutil/${vpython_platform}\"@@@", - "@@@STEP_LOG_LINE@python.inline@# version: \"version:5.8.0.chromium.2\"@@@", + "@@@STEP_LOG_LINE@python.inline@# version: \"version:5.4.7\"@@@", "@@@STEP_LOG_LINE@python.inline@# >@@@", "@@@STEP_LOG_LINE@python.inline@# [VPYTHON:END]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/compile.py b/infra/bots/recipes/compile.py index b45e207d22..ef41553fff 100644 --- a/infra/bots/recipes/compile.py +++ b/infra/bots/recipes/compile.py @@ -5,7 +5,7 @@ # Recipe module for Skia Swarming compile. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'build', @@ -44,7 +44,7 @@ def RunSteps(api): # [VPYTHON:BEGIN] # wheel: < # name: "infra/python/wheels/psutil/${vpython_platform}" -# version: "version:5.8.0.chromium.2" +# version: "version:5.4.7" # > # [VPYTHON:END] diff --git a/infra/bots/recipes/compute_buildstats.expected/normal_bot.json b/infra/bots/recipes/compute_buildstats.expected/normal_bot.json index f47ab16c8a..77405ad16f 100644 --- a/infra/bots/recipes/compute_buildstats.expected/normal_bot.json +++ b/infra/bots/recipes/compute_buildstats.expected/normal_bot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/compute_buildstats.expected/trybot.json b/infra/bots/recipes/compute_buildstats.expected/trybot.json index 69c3aa9f6d..2fefccc1e9 100644 --- a/infra/bots/recipes/compute_buildstats.expected/trybot.json +++ b/infra/bots/recipes/compute_buildstats.expected/trybot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/compute_buildstats.py b/infra/bots/recipes/compute_buildstats.py index 4fc5197802..281da17255 100644 --- a/infra/bots/recipes/compute_buildstats.py +++ b/infra/bots/recipes/compute_buildstats.py @@ -7,7 +7,7 @@ import ast import json -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index c75a88b2d7..5ab0f28f1d 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index e2c005d6e6..07caa9f157 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/housekeeper.py b/infra/bots/recipes/housekeeper.py index a012c0144e..18387f5b48 100644 --- a/infra/bots/recipes/housekeeper.py +++ b/infra/bots/recipes/housekeeper.py @@ -8,7 +8,7 @@ import calendar -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/infra.py b/infra/bots/recipes/infra.py index 673fb2c4f1..a961a50704 100644 --- a/infra/bots/recipes/infra.py +++ b/infra/bots/recipes/infra.py @@ -5,7 +5,7 @@ # Recipe which runs the Skia infra tests. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'infra', diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json index 13997cdd9f..dcf9f83986 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-CPU-Tegra3-arm-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "0", "userspace" @@ -70,19 +70,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -93,7 +90,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).decode('utf-8').strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ntarget_percent = float(sys.argv[2])\ncpu = int(sys.argv[3])\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nroot = '/sys/devices/system/cpu/cpu%d/cpufreq' %cpu\n\n# All devices we test on give a list of their available frequencies.\navailable_freqs = subprocess.check_output([ADB, 'shell',\n 'cat %s/scaling_available_frequencies' % root])\n\n# Check for message like '/system/bin/sh: file not found'\nif available_freqs and '/system/bin/sh' not in available_freqs:\n available_freqs = sorted(\n int(i) for i in available_freqs.strip().split())\nelse:\n raise Exception('Could not get list of available frequencies: %s' %\n available_freqs)\n\nmaxfreq = available_freqs[-1]\ntarget = int(round(maxfreq * target_percent))\nfreq = maxfreq\nfor f in reversed(available_freqs):\n if f <= target:\n freq = f\n break\n\nprint('Setting frequency to %d' % freq)\n\n# If scaling_max_freq is lower than our attempted setting, it won't take.\n# We must set min first, because if we try to set max to be less than min\n# (which sometimes happens after certain devices reboot) it returns a\n# perplexing permissions error.\nsubprocess.check_output([ADB, 'shell', 'echo 0 > '\n '%s/scaling_min_freq' % root])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_max_freq' % (freq, root)])\nsubprocess.check_output([ADB, 'shell', 'echo %d > '\n '%s/scaling_setspeed' % (freq, root)])\ntime.sleep(5)\nactual_freq = subprocess.check_output([ADB, 'shell', 'cat '\n '%s/scaling_cur_freq' % root]).strip()\nif actual_freq != str(freq):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_freq, freq))\n", "/usr/bin/adb.1.0.35", "0.6", "0" @@ -114,7 +111,7 @@ "@@@STEP_LOG_LINE@python.inline@ADB = sys.argv[1]@@@", "@@@STEP_LOG_LINE@python.inline@target_percent = float(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[3])@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -124,7 +121,7 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# All devices we test on give a list of their available frequencies.@@@", "@@@STEP_LOG_LINE@python.inline@available_freqs = subprocess.check_output([ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'cat %s/scaling_available_frequencies' % root])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@# Check for message like '/system/bin/sh: file not found'@@@", "@@@STEP_LOG_LINE@python.inline@if available_freqs and '/system/bin/sh' not in available_freqs:@@@", @@ -148,15 +145,15 @@ "@@@STEP_LOG_LINE@python.inline@# We must set min first, because if we try to set max to be less than min@@@", "@@@STEP_LOG_LINE@python.inline@# (which sometimes happens after certain devices reboot) it returns a@@@", "@@@STEP_LOG_LINE@python.inline@# perplexing permissions error.@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo 0 > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo 0 > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_min_freq' % root])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_max_freq' % (freq, root)])@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_([ADB, 'shell', 'echo %d > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %d > '@@@", "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_setspeed' % (freq, root)])@@@", "@@@STEP_LOG_LINE@python.inline@time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@actual_freq = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '%s/scaling_cur_freq' % root]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_freq != str(freq):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_freq, freq))@@@", @@ -235,7 +232,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/TEXTTRACES_VERSION" ], @@ -263,10 +260,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -280,7 +276,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/text_blob_traces" ], @@ -308,10 +304,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -482,7 +477,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -510,10 +505,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -527,7 +521,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -555,10 +549,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -693,7 +686,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -721,10 +714,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -738,7 +730,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/images" ], @@ -766,10 +758,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -904,7 +895,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -932,10 +923,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -949,7 +939,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -977,10 +967,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1129,7 +1118,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "nanobench.sh" ], @@ -1146,8 +1135,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1158,7 +1147,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1174,7 +1163,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1182,8 +1171,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index 00f5d479b3..f18112009f 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -10,7 +10,7 @@ import calendar import json import os -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipes/perf_pathkit.py b/infra/bots/recipes/perf_pathkit.py index af81fc5e7d..18ae61087d 100644 --- a/infra/bots/recipes/perf_pathkit.py +++ b/infra/bots/recipes/perf_pathkit.py @@ -4,7 +4,7 @@ # Recipe which runs the PathKit tests using docker -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json index 8befefb235..657f84e54e 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json +++ b/infra/bots/recipes/perf_skottietrace.expected/Perf-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-All-Android_SkottieTracing.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "hotplug" @@ -70,19 +70,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -197,7 +194,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], @@ -225,10 +222,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -242,7 +238,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/lotties" ], @@ -270,10 +266,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -356,7 +351,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out" ], @@ -384,10 +379,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -491,7 +485,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -508,8 +502,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -608,7 +602,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/2.json" ], @@ -636,10 +630,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -706,7 +699,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -723,8 +716,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -823,7 +816,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/3.json" ], @@ -851,10 +844,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -921,7 +913,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -938,8 +930,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1038,7 +1030,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/4.json" ], @@ -1066,10 +1058,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1182,7 +1173,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1198,7 +1189,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1206,8 +1197,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json index dc8b6d595f..017cfa1b7a 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_parse_trace_error.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "hotplug" @@ -70,19 +70,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -197,7 +194,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], @@ -225,10 +222,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -242,7 +238,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/lotties" ], @@ -270,10 +266,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -356,7 +351,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out" ], @@ -384,10 +379,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -491,7 +485,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -508,8 +502,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -609,7 +603,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -625,7 +619,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -633,8 +627,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json index 0f375e5149..bbc6aadde1 100644 --- a/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json +++ b/infra/bots/recipes/perf_skottietrace.expected/skottietracing_trybot.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/opt/infra-android/tools/adb", "0", "hotplug" @@ -70,19 +70,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -197,7 +194,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/LOTTIE_VERSION" ], @@ -225,10 +222,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -242,7 +238,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/lotties" ], @@ -270,10 +266,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -356,7 +351,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out" ], @@ -384,10 +379,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -491,7 +485,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -508,8 +502,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -608,7 +602,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/2.json" ], @@ -636,10 +630,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -706,7 +699,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -723,8 +716,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -823,7 +816,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/3.json" ], @@ -851,10 +844,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -921,7 +913,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -938,8 +930,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/opt/infra-android/tools/adb', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/opt/infra-android/tools/adb', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/opt/infra-android/tools/adb', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1038,7 +1030,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/opt/infra-android/tools/adb", "/sdcard/revenge_of_the_skiabot/dm_out/4.json" ], @@ -1066,10 +1058,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1185,7 +1176,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1201,7 +1192,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/opt/infra-android/tools/adb', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1209,8 +1200,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/perf_skottietrace.py b/infra/bots/recipes/perf_skottietrace.py index f3ce89f5a1..94ca1f75e5 100644 --- a/infra/bots/recipes/perf_skottietrace.py +++ b/infra/bots/recipes/perf_skottietrace.py @@ -12,7 +12,7 @@ import json import re import string -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'flavor', diff --git a/infra/bots/recipes/perf_skottiewasm_lottieweb.py b/infra/bots/recipes/perf_skottiewasm_lottieweb.py index 275a862fa5..121ff5c301 100644 --- a/infra/bots/recipes/perf_skottiewasm_lottieweb.py +++ b/infra/bots/recipes/perf_skottiewasm_lottieweb.py @@ -8,7 +8,7 @@ import calendar import json import re -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" # trim DEPS = [ diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json index 334862b553..d172f75210 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_AllPathsVolatile_Skpbench.json @@ -117,7 +117,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -145,10 +145,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -162,7 +161,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -190,10 +189,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -387,7 +385,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -403,7 +401,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -411,8 +409,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json index 6bceff7ee6..28ff912e4f 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-GalaxyS20-GPU-MaliG77-arm64-Release-All-Android_Vulkan_AllPathsVolatile_Skpbench.json @@ -117,7 +117,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -145,10 +145,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -162,7 +161,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -190,10 +189,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -387,7 +385,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -403,7 +401,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -411,8 +409,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json index e47bd18400..474c9dc3b3 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Release-All-Android_Skpbench_Mskp.json @@ -100,7 +100,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/MSKP_VERSION" ], @@ -128,10 +128,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -145,7 +144,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/mskp" ], @@ -173,10 +172,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -365,7 +363,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -381,7 +379,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -389,8 +387,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 56f7998211..0b5dab7f09 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -100,7 +100,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -128,10 +128,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -145,7 +144,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -173,10 +172,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -374,7 +372,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -390,7 +388,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -398,8 +396,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py index c91d9549b4..8ba523fdbe 100644 --- a/infra/bots/recipes/skpbench.py +++ b/infra/bots/recipes/skpbench.py @@ -8,7 +8,7 @@ import calendar -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'flavor', diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-Flutter_Android.json b/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-Flutter_Android.json index c62e922dc4..49e0d9a601 100644 --- a/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-Flutter_Android.json +++ b/infra/bots/recipes/sync_and_compile.expected/Build-Debian10-Clang-arm-Release-Flutter_Android.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 39154195a3..2db9311cf8 100644 --- a/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/sync_and_compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json b/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json index 4414ced0c9..aded426281 100644 --- a/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json +++ b/infra/bots/recipes/sync_and_compile.expected/Build-Win10-Clang-x86_64-Release-NoDEPS.json @@ -3,7 +3,7 @@ "cmd": [ "python", "-u", - "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git']).decode('utf-8')\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" + "\nfrom __future__ import print_function\nimport subprocess\nimport sys\n\nwhich = 'where' if sys.platform == 'win32' else 'which'\ngit = subprocess.check_output([which, 'git'])\nprint('git was found at %s' % git)\nif 'cipd_bin_packages' not in git:\n print('Git must be obtained through CIPD.', file=sys.stderr)\n sys.exit(1)\n" ], "env": { "CHROME_HEADLESS": "1", @@ -17,7 +17,7 @@ "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@which = 'where' if sys.platform == 'win32' else 'which'@@@", - "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@git = subprocess.check_output([which, 'git'])@@@", "@@@STEP_LOG_LINE@python.inline@print('git was found at %s' % git)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cipd_bin_packages' not in git:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Git must be obtained through CIPD.', file=sys.stderr)@@@", diff --git a/infra/bots/recipes/sync_and_compile.py b/infra/bots/recipes/sync_and_compile.py index 78d594abc8..543efff426 100644 --- a/infra/bots/recipes/sync_and_compile.py +++ b/infra/bots/recipes/sync_and_compile.py @@ -5,7 +5,7 @@ # Recipe module for Skia Swarming compile. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'build', diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json index aef9ee63c1..0ac5e7cf61 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm-Debug-All-Android_ASAN.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print('Waiting for device')\n subprocess.check_([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete']).decode('utf-8')\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed']).decode('utf-8')\n if '1' in bit1 and '1' in bit2:\n print('Device detected')\n break\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity']).decode('utf-8')\nprint(output)\n\nif 'already disabled' not in output:\n print('Rebooting device')\n subprocess.check_call([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device']).decode('utf-8')\n print(out)\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print(stdout.decode('utf-8'))\n print('Stderr: %s' % stderr.decode('utf-8'))\n return process.returncode == 0\n\nif not installASAN():\n print('Trying to revert the ASAN install and then re-install')\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n# Sleep again to hopefully avoid error \"secure_mkdirs failed: No such file or\n# directory\" when pushing resources to the device.\ntime.sleep(60)\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\nASAN_SETUP = sys.argv[2]\n\ndef wait_for_device():\n while True:\n time.sleep(5)\n print('Waiting for device')\n subprocess.check_output([ADB, 'wait-for-device'])\n bit1 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'dev.bootcomplete'])\n bit2 = subprocess.check_output([ADB, 'shell', 'getprop',\n 'sys.boot_completed'])\n if '1' in bit1 and '1' in bit2:\n print('Device detected')\n break\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\noutput = subprocess.check_output([ADB, 'disable-verity'])\nprint(output)\n\nif 'already disabled' not in output:\n print('Rebooting device')\n subprocess.check_output([ADB, 'reboot'])\n wait_for_device()\n\ndef installASAN(revert=False):\n # ASAN setup script is idempotent, either it installs it or\n # says it's installed. Returns True on success, false otherwise.\n out = subprocess.check_output([ADB, 'wait-for-device'])\n print(out)\n cmd = [ASAN_SETUP]\n if revert:\n cmd = [ASAN_SETUP, '--revert']\n process = subprocess.Popen(cmd, env={'ADB': ADB},\n stdout=subprocess.PIPE, stderr=subprocess.PIPE)\n\n # this also blocks until command finishes\n (stdout, stderr) = process.communicate()\n print(stdout)\n print('Stderr: %s' % stderr)\n return process.returncode == 0\n\nif not installASAN():\n print('Trying to revert the ASAN install and then re-install')\n # ASAN script sometimes has issues if it was interrupted or partially applied\n # Try reverting it, then re-enabling it\n if not installASAN(revert=True):\n raise Exception('reverting ASAN install failed')\n\n # Sleep because device does not reboot instantly\n time.sleep(10)\n\n if not installASAN():\n raise Exception('Tried twice to setup ASAN and failed.')\n\n# Sleep because device does not reboot instantly\ntime.sleep(10)\nwait_for_device()\n# Sleep again to hopefully avoid error \"secure_mkdirs failed: No such file or\n# directory\" when pushing resources to the device.\ntime.sleep(60)\n", "/usr/bin/adb.1.0.35", "[START_DIR]/android_ndk_linux/toolchains/llvm/prebuilt/linux-x86_64/lib64/clang/9.0.8/bin/asan_device_setup" ], @@ -72,33 +72,33 @@ "@@@STEP_LOG_LINE@python.inline@ while True:@@@", "@@@STEP_LOG_LINE@python.inline@ time.sleep(5)@@@", "@@@STEP_LOG_LINE@python.inline@ print('Waiting for device')@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_([ADB, 'wait-for-device'])@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'wait-for-device'])@@@", "@@@STEP_LOG_LINE@python.inline@ bit1 = subprocess.check_output([ADB, 'shell', 'getprop',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'dev.bootcomplete']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'dev.bootcomplete'])@@@", "@@@STEP_LOG_LINE@python.inline@ bit2 = subprocess.check_output([ADB, 'shell', 'getprop',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'sys.boot_completed']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ 'sys.boot_completed'])@@@", "@@@STEP_LOG_LINE@python.inline@ if '1' in bit1 and '1' in bit2:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Device detected')@@@", "@@@STEP_LOG_LINE@python.inline@ break@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'disable-verity']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@output = subprocess.check_output([ADB, 'disable-verity'])@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@if 'already disabled' not in output:@@@", "@@@STEP_LOG_LINE@python.inline@ print('Rebooting device')@@@", - "@@@STEP_LOG_LINE@python.inline@ subprocess.check_call([ADB, 'reboot'])@@@", + "@@@STEP_LOG_LINE@python.inline@ subprocess.check_output([ADB, 'reboot'])@@@", "@@@STEP_LOG_LINE@python.inline@ wait_for_device()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@def installASAN(revert=False):@@@", "@@@STEP_LOG_LINE@python.inline@ # ASAN setup script is idempotent, either it installs it or@@@", "@@@STEP_LOG_LINE@python.inline@ # says it's installed. Returns True on success, false otherwise.@@@", - "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ out = subprocess.check_output([ADB, 'wait-for-device'])@@@", "@@@STEP_LOG_LINE@python.inline@ print(out)@@@", "@@@STEP_LOG_LINE@python.inline@ cmd = [ASAN_SETUP]@@@", "@@@STEP_LOG_LINE@python.inline@ if revert:@@@", @@ -108,8 +108,8 @@ "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@ # this also blocks until command finishes@@@", "@@@STEP_LOG_LINE@python.inline@ (stdout, stderr) = process.communicate()@@@", - "@@@STEP_LOG_LINE@python.inline@ print(stdout.decode('utf-8'))@@@", - "@@@STEP_LOG_LINE@python.inline@ print('Stderr: %s' % stderr.decode('utf-8'))@@@", + "@@@STEP_LOG_LINE@python.inline@ print(stdout)@@@", + "@@@STEP_LOG_LINE@python.inline@ print('Stderr: %s' % stderr)@@@", "@@@STEP_LOG_LINE@python.inline@ return process.returncode == 0@@@", "@@@STEP_LOG_LINE@python.inline@@@@", "@@@STEP_LOG_LINE@python.inline@if not installASAN():@@@", @@ -138,7 +138,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "0", "1" @@ -160,7 +160,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -169,15 +169,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -188,7 +188,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "1", "1" @@ -210,7 +210,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -219,15 +219,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -238,7 +238,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "2", "1" @@ -260,7 +260,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -269,15 +269,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -288,7 +288,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "3", "1" @@ -310,7 +310,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -319,15 +319,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -338,7 +338,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "4", "ondemand" @@ -360,19 +360,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -383,7 +380,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "0", "ondemand" @@ -405,19 +402,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -532,7 +526,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -560,10 +554,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -577,7 +570,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -605,10 +598,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -743,7 +735,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -771,10 +763,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -788,7 +779,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/images" ], @@ -816,10 +807,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -954,7 +944,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -982,10 +972,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -999,7 +988,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -1027,10 +1016,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1179,7 +1167,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -1196,8 +1184,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1234,7 +1222,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1250,7 +1238,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1258,8 +1246,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json index 54f7aaa690..dee26d7d8d 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Pixel2XL-GPU-Adreno540-arm64-Debug-All-Android.json @@ -48,7 +48,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "0", "1" @@ -70,7 +70,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -79,15 +79,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -98,7 +98,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "1", "1" @@ -120,7 +120,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -129,15 +129,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -148,7 +148,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "2", "1" @@ -170,7 +170,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -179,15 +179,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -198,7 +198,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_call([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\nvalue = int(sys.argv[3])\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\n# If we try to echo 1 to an already online cpu, adb returns exit code 1.\n# So, check the value before trying to write it.\nprior_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif prior_status == str(value):\n print('CPU %d online already %d' % (cpu, value))\n sys.exit()\n\nsubprocess.check_output([ADB, 'shell', 'echo %s > '\n '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])\nactual_status = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()\nif actual_status != str(value):\n raise Exception('(actual, expected) (%s, %d)'\n % (actual_status, value))\n", "/usr/bin/adb.1.0.35", "3", "1" @@ -220,7 +220,7 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@value = int(sys.argv[3])@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", @@ -229,15 +229,15 @@ "@@@STEP_LOG_LINE@python.inline@# If we try to echo 1 to an already online cpu, adb returns exit code 1.@@@", "@@@STEP_LOG_LINE@python.inline@# So, check the value before trying to write it.@@@", "@@@STEP_LOG_LINE@python.inline@prior_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if prior_status == str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ print('CPU %d online already %d' % (cpu, value))@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit()@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_call([ADB, 'shell', 'echo %s > '@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo %s > '@@@", "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % (value, cpu)])@@@", "@@@STEP_LOG_LINE@python.inline@actual_status = subprocess.check_output([ADB, 'shell', 'cat '@@@", - "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/online' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_status != str(value):@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %d)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_status, value))@@@", @@ -248,7 +248,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "4", "ondemand" @@ -270,19 +270,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -293,7 +290,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root']).decode('utf-8')\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([\n ADB, 'shell',\n 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (\n gov, cpu)]).decode('utf-8')\nactual_gov = subprocess.check_output([\n ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %\n cpu]).decode('utf-8').strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", + "\nimport os\nimport subprocess\nimport sys\nimport time\nADB = sys.argv[1]\ncpu = int(sys.argv[2])\ngov = sys.argv[3]\n\nlog = subprocess.check_output([ADB, 'root'])\n# check for message like 'adbd cannot run as root in production builds'\nprint(log)\nif 'cannot' in log:\n raise Exception('adb root failed')\n\nsubprocess.check_output([ADB, 'shell', 'echo \"%s\" > '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])\nactual_gov = subprocess.check_output([ADB, 'shell', 'cat '\n '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()\nif actual_gov != gov:\n raise Exception('(actual, expected) (%s, %s)'\n % (actual_gov, gov))\n", "/usr/bin/adb.1.0.35", "0", "ondemand" @@ -315,19 +312,16 @@ "@@@STEP_LOG_LINE@python.inline@cpu = int(sys.argv[2])@@@", "@@@STEP_LOG_LINE@python.inline@gov = sys.argv[3]@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output([ADB, 'root'])@@@", "@@@STEP_LOG_LINE@python.inline@# check for message like 'adbd cannot run as root in production builds'@@@", "@@@STEP_LOG_LINE@python.inline@print(log)@@@", "@@@STEP_LOG_LINE@python.inline@if 'cannot' in log:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('adb root failed')@@@", "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell',@@@", - "@@@STEP_LOG_LINE@python.inline@ 'echo \"%s\" > /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (@@@", - "@@@STEP_LOG_LINE@python.inline@ gov, cpu)]).decode('utf-8')@@@", - "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ ADB, 'shell', 'cat /sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' %@@@", - "@@@STEP_LOG_LINE@python.inline@ cpu]).decode('utf-8').strip()@@@", + "@@@STEP_LOG_LINE@python.inline@subprocess.check_output([ADB, 'shell', 'echo \"%s\" > '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % (gov, cpu)])@@@", + "@@@STEP_LOG_LINE@python.inline@actual_gov = subprocess.check_output([ADB, 'shell', 'cat '@@@", + "@@@STEP_LOG_LINE@python.inline@ '/sys/devices/system/cpu/cpu%d/cpufreq/scaling_governor' % cpu]).strip()@@@", "@@@STEP_LOG_LINE@python.inline@if actual_gov != gov:@@@", "@@@STEP_LOG_LINE@python.inline@ raise Exception('(actual, expected) (%s, %s)'@@@", "@@@STEP_LOG_LINE@python.inline@ % (actual_gov, gov))@@@", @@ -442,7 +436,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SKP_VERSION" ], @@ -470,10 +464,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -487,7 +480,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/skps" ], @@ -515,10 +508,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -653,7 +645,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION" ], @@ -681,10 +673,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -698,7 +689,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/images" ], @@ -726,10 +717,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -864,7 +854,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/SVG_VERSION" ], @@ -892,10 +882,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -909,7 +898,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/svgs" ], @@ -937,10 +926,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1051,7 +1039,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(\n cmd, stderr=subprocess.STDOUT).decode('utf-8')\nexcept subprocess.CalledProcessError as e:\n output = e.output.decode('utf-8')\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", + "\nimport subprocess\nimport sys\n\n# Remove the path.\nadb = sys.argv[1]\npath = sys.argv[2]\nprint('Removing %s' % path)\ncmd = [adb, 'shell', 'rm', '-rf', path]\nprint(' '.join(cmd))\nsubprocess.check_call(cmd)\n\n# Verify that the path was deleted.\nprint('Checking for existence of %s' % path)\ncmd = [adb, 'shell', 'ls', path]\nprint(' '.join(cmd))\ntry:\n output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)\nexcept subprocess.CalledProcessError as e:\n output = e.output\nprint('Output was:')\nprint('======')\nprint(output)\nprint('======')\nif 'No such file or directory' not in output:\n raise Exception('%s exists despite being deleted' % path)\n", "/usr/bin/adb.1.0.35", "/sdcard/revenge_of_the_skiabot/dm_out" ], @@ -1079,10 +1067,9 @@ "@@@STEP_LOG_LINE@python.inline@cmd = [adb, 'shell', 'ls', path]@@@", "@@@STEP_LOG_LINE@python.inline@print(' '.join(cmd))@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(@@@", - "@@@STEP_LOG_LINE@python.inline@ cmd, stderr=subprocess.STDOUT).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = subprocess.check_output(cmd, stderr=subprocess.STDOUT)@@@", "@@@STEP_LOG_LINE@python.inline@except subprocess.CalledProcessError as e:@@@", - "@@@STEP_LOG_LINE@python.inline@ output = e.output.decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ output = e.output@@@", "@@@STEP_LOG_LINE@python.inline@print('Output was:')@@@", "@@@STEP_LOG_LINE@python.inline@print('======')@@@", "@@@STEP_LOG_LINE@python.inline@print(output)@@@", @@ -1243,7 +1230,7 @@ "cmd": [ "python", "-u", - "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output([\n '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", + "\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print(\"Couldn't read the return code. Probably killed for OOM.\")\n sys.exit(1)\n", "/data/local/tmp/", "dm.sh" ], @@ -1260,8 +1247,8 @@ "@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@", "@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['/usr/bin/adb.1.0.35', 'shell', 'sh', bin_dir + sh])@@@", "@@@STEP_LOG_LINE@python.inline@try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ '/usr/bin/adb.1.0.35', 'shell', 'cat', bin_dir + 'rc']).decode('utf-8')))@@@", + "@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['/usr/bin/adb.1.0.35', 'shell', 'cat',@@@", + "@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@", "@@@STEP_LOG_LINE@python.inline@except ValueError:@@@", "@@@STEP_LOG_LINE@python.inline@ print(\"Couldn't read the return code. Probably killed for OOM.\")@@@", "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", @@ -1387,7 +1374,7 @@ "cmd": [ "python", "-u", - "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output([\n 'addr2line', '-Cfpe', local, addr]).decode('utf-8')\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", + "\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n try:\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n except subprocess.CalledProcessError:\n pass\n print(line)\n", "[START_DIR]/build" ], "env": { @@ -1403,7 +1390,7 @@ "@@@STEP_LOG_LINE@python.inline@import subprocess@@@", "@@@STEP_LOG_LINE@python.inline@import sys@@@", "@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d']).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['/usr/bin/adb.1.0.35', 'logcat', '-d'])@@@", "@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@", "@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@", "@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@", @@ -1411,8 +1398,7 @@ "@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@", "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@", "@@@STEP_LOG_LINE@python.inline@ try:@@@", - "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output([@@@", - "@@@STEP_LOG_LINE@python.inline@ 'addr2line', '-Cfpe', local, addr]).decode('utf-8')@@@", + "@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@", "@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@", "@@@STEP_LOG_LINE@python.inline@ except subprocess.CalledProcessError:@@@", "@@@STEP_LOG_LINE@python.inline@ pass@@@", diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 753dfc68cb..08d45d1d55 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -8,7 +8,7 @@ import json -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'env', diff --git a/infra/bots/recipes/test_canvaskit.py b/infra/bots/recipes/test_canvaskit.py index 06ae06bbee..cdb4531678 100644 --- a/infra/bots/recipes/test_canvaskit.py +++ b/infra/bots/recipes/test_canvaskit.py @@ -4,7 +4,7 @@ # Recipe which runs the Canvaskit tests using docker -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/test_lottie_web.py b/infra/bots/recipes/test_lottie_web.py index 4ed1e03c05..113cae4817 100644 --- a/infra/bots/recipes/test_lottie_web.py +++ b/infra/bots/recipes/test_lottie_web.py @@ -4,7 +4,7 @@ # Recipe which generates the Gold images for lottie-web using docker -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/test_pathkit.py b/infra/bots/recipes/test_pathkit.py index a2850c7b1d..371e19e342 100644 --- a/infra/bots/recipes/test_pathkit.py +++ b/infra/bots/recipes/test_pathkit.py @@ -4,7 +4,7 @@ # Recipe which runs the PathKit tests using docker -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'checkout', diff --git a/infra/bots/recipes/upload_buildstats_results.py b/infra/bots/recipes/upload_buildstats_results.py index 8c347feb01..d785ce2557 100644 --- a/infra/bots/recipes/upload_buildstats_results.py +++ b/infra/bots/recipes/upload_buildstats_results.py @@ -5,7 +5,7 @@ # Recipe for uploading buildstats results to Perf. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index 4947c0ccbb..159f494196 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -8,7 +8,7 @@ import calendar -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/file', diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index c5bd0da564..ac85b12d25 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -5,7 +5,7 @@ # Recipe for uploading nanobench results. -PYTHON_VERSION_COMPATIBILITY = "PY3" +PYTHON_VERSION_COMPATIBILITY = "PY2+3" DEPS = [ 'recipe_engine/context', diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index ea6fb81513..40f7b432be 100755 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -3106,22 +3106,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3148,10 +3148,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3161,8 +3157,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3202,22 +3198,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3244,10 +3240,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3257,8 +3249,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3298,22 +3290,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/armhf_sysroot", @@ -3350,10 +3342,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3363,8 +3351,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3404,22 +3392,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3446,10 +3434,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3459,8 +3443,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3500,22 +3484,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3542,10 +3526,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3555,8 +3535,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3596,22 +3576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3638,10 +3618,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3651,8 +3627,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3692,22 +3668,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/armhf_sysroot", @@ -3744,10 +3720,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3757,8 +3729,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3798,22 +3770,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3840,10 +3812,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3853,8 +3821,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3894,22 +3862,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -3936,10 +3904,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -3949,8 +3913,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -3990,22 +3954,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4032,10 +3996,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4045,8 +4005,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4086,22 +4046,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4128,10 +4088,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4141,8 +4097,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4182,22 +4138,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4224,10 +4180,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4237,8 +4189,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4278,22 +4230,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4320,10 +4272,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4333,8 +4281,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4374,22 +4322,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4416,10 +4364,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4429,8 +4373,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4470,22 +4414,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4512,10 +4456,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4525,8 +4465,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4566,22 +4506,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4608,10 +4548,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4621,8 +4557,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4662,22 +4598,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4704,10 +4640,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4717,8 +4649,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4762,22 +4694,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -4809,10 +4741,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4822,8 +4750,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4863,22 +4791,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -4905,10 +4833,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -4918,8 +4842,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -4959,22 +4883,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -5001,10 +4925,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5014,8 +4934,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5055,22 +4975,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -5097,10 +5017,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5110,8 +5026,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5151,22 +5067,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -5193,10 +5109,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5206,8 +5118,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5251,22 +5163,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5298,10 +5210,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5311,8 +5219,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5356,22 +5264,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5403,10 +5311,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5416,8 +5320,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5461,22 +5365,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5508,10 +5412,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5521,8 +5421,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5562,22 +5462,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/chromebook_x86_64_gles", @@ -5609,10 +5509,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5622,8 +5518,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5667,22 +5563,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5714,10 +5610,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5727,8 +5619,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5772,22 +5664,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5819,10 +5711,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5832,8 +5720,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5877,22 +5765,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -5924,10 +5812,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -5937,8 +5821,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -5982,22 +5866,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6029,10 +5913,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6042,8 +5922,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6087,22 +5967,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6139,10 +6019,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6152,8 +6028,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6197,22 +6073,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6249,10 +6125,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6262,8 +6134,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6307,22 +6179,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6354,10 +6226,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6367,8 +6235,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6412,22 +6280,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6459,10 +6327,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6472,8 +6336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6517,22 +6381,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6564,10 +6428,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6577,8 +6437,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6622,22 +6482,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6669,10 +6529,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6682,8 +6538,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6727,22 +6583,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6774,10 +6630,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6787,8 +6639,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6832,22 +6684,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -6879,10 +6731,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -6892,8 +6740,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -6953,37 +6801,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7016,10 +6864,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7029,8 +6873,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7069,22 +6913,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/chromebook_x86_64_gles", @@ -7116,10 +6960,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7129,8 +6969,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7174,22 +7014,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7221,10 +7061,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7234,8 +7070,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7279,22 +7115,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7326,10 +7162,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7339,8 +7171,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7392,37 +7224,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7454,10 +7286,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7467,8 +7295,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7511,22 +7339,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7558,10 +7386,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7571,8 +7395,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7616,22 +7440,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7663,10 +7487,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7676,8 +7496,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7721,22 +7541,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7768,10 +7588,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7781,8 +7597,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7826,22 +7642,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7873,10 +7689,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7886,8 +7698,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -7931,22 +7743,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -7978,10 +7790,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -7991,8 +7799,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8036,22 +7844,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8088,10 +7896,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8101,8 +7905,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8146,22 +7950,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8193,10 +7997,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8206,8 +8006,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8251,22 +8051,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8298,10 +8098,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8311,8 +8107,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8356,22 +8152,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8403,10 +8199,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8416,8 +8208,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8461,22 +8253,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8508,10 +8300,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8521,8 +8309,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8570,22 +8358,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8613,10 +8401,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8626,8 +8410,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8675,22 +8459,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8718,10 +8502,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8731,8 +8511,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8780,22 +8560,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8823,10 +8603,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8836,8 +8612,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8885,22 +8661,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -8928,10 +8704,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -8941,8 +8713,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -8990,22 +8762,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9033,10 +8805,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9046,8 +8814,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9095,22 +8863,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9138,10 +8906,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9151,8 +8915,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9200,22 +8964,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9243,10 +9007,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9256,8 +9016,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9305,22 +9065,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9348,10 +9108,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9361,8 +9117,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9392,7 +9148,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -9459,22 +9215,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9502,10 +9258,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9515,8 +9267,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9564,22 +9316,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9607,10 +9359,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9620,8 +9368,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9669,22 +9417,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9712,10 +9460,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9725,8 +9469,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9774,22 +9518,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9817,10 +9561,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9830,8 +9570,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9879,22 +9619,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -9922,10 +9662,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -9935,8 +9671,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -9984,22 +9720,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -10027,10 +9763,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10040,8 +9772,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10089,22 +9821,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -10132,10 +9864,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10145,8 +9873,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10202,37 +9930,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_linux", @@ -10260,10 +9988,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10273,8 +9997,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10321,22 +10045,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -10367,10 +10091,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10380,8 +10100,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10429,22 +10149,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -10475,10 +10195,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10488,8 +10204,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10529,22 +10245,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_darwin", @@ -10570,10 +10286,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10583,8 +10295,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10632,22 +10344,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -10678,10 +10390,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10691,8 +10399,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10740,22 +10448,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -10786,10 +10494,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10799,8 +10503,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10848,22 +10552,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -10894,10 +10598,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -10907,8 +10607,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -10956,22 +10656,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11007,10 +10707,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11020,8 +10716,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11069,22 +10765,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11120,10 +10816,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11133,8 +10825,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11182,22 +10874,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11233,10 +10925,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11246,8 +10934,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11295,22 +10983,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11341,10 +11029,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11354,8 +11038,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11403,22 +11087,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11449,10 +11133,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11462,8 +11142,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11511,22 +11191,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11557,10 +11237,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11570,8 +11246,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11619,22 +11295,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11670,10 +11346,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11683,8 +11355,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11732,22 +11404,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11783,10 +11455,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11796,8 +11464,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11845,22 +11513,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -11896,10 +11564,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -11909,8 +11573,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -11958,22 +11622,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12009,10 +11673,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12022,8 +11682,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12071,22 +11731,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12117,10 +11777,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12130,8 +11786,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12179,22 +11835,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12225,10 +11881,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12238,8 +11890,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12287,22 +11939,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12333,10 +11985,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12346,8 +11994,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12407,37 +12055,37 @@ { "name": "infra/3pp/tools/git/mac-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12468,10 +12116,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12481,8 +12125,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12529,22 +12173,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12575,10 +12219,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12588,8 +12228,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12637,22 +12277,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12683,10 +12323,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12696,8 +12332,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12757,37 +12393,37 @@ { "name": "infra/3pp/tools/git/mac-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12818,10 +12454,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12831,8 +12463,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12879,22 +12511,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -12925,10 +12557,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -12938,8 +12566,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -12987,22 +12615,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13033,10 +12661,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13046,8 +12670,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13095,22 +12719,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13141,10 +12765,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13154,8 +12774,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13203,22 +12823,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13254,10 +12874,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13267,8 +12883,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13316,22 +12932,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13367,10 +12983,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13380,8 +12992,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13429,22 +13041,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13480,10 +13092,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13493,8 +13101,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13542,22 +13150,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/mac_toolchain/${platform}", @@ -13593,10 +13201,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13606,8 +13210,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13647,22 +13251,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -13690,10 +13294,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13703,8 +13303,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13744,22 +13344,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -13787,10 +13387,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13800,8 +13396,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13841,22 +13437,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -13884,10 +13480,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13897,8 +13489,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -13938,22 +13530,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -13981,10 +13573,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -13994,8 +13582,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14035,22 +13623,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/android_ndk_windows", @@ -14077,10 +13665,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14090,8 +13674,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14131,22 +13715,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14174,10 +13758,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14187,8 +13767,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14228,22 +13808,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14271,10 +13851,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14284,8 +13860,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14325,22 +13901,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14368,10 +13944,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14381,8 +13953,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14422,22 +13994,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14465,10 +14037,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14478,8 +14046,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14519,22 +14087,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14562,10 +14130,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14575,8 +14139,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14616,22 +14180,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14659,10 +14223,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14672,8 +14232,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14713,22 +14273,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14756,10 +14316,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14769,8 +14325,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14810,22 +14366,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14853,10 +14409,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14866,8 +14418,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -14907,22 +14459,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -14950,10 +14502,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -14963,8 +14511,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15004,22 +14552,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15047,10 +14595,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15060,8 +14604,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15101,22 +14645,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15144,10 +14688,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15157,8 +14697,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15198,22 +14738,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15241,10 +14781,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15254,8 +14790,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15295,22 +14831,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15338,10 +14874,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15351,8 +14883,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15392,22 +14924,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15435,10 +14967,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15448,8 +14976,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15489,22 +15017,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15532,10 +15060,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15545,8 +15069,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15586,22 +15110,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_win", @@ -15629,10 +15153,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15642,8 +15162,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15683,22 +15203,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -15721,10 +15241,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15734,8 +15250,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15775,22 +15291,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -15813,10 +15329,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15826,8 +15338,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15867,22 +15379,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -15905,10 +15417,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -15918,8 +15426,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -15959,22 +15467,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -15997,10 +15505,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16010,8 +15514,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16051,22 +15555,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16089,10 +15593,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16102,8 +15602,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16143,22 +15643,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16181,10 +15681,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16194,8 +15690,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16235,22 +15731,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16273,10 +15769,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16286,8 +15778,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16327,22 +15819,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16365,10 +15857,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16378,8 +15866,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16419,22 +15907,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16457,10 +15945,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16470,8 +15954,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16511,22 +15995,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16549,10 +16033,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16562,8 +16042,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16603,22 +16083,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16641,10 +16121,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16654,8 +16130,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16695,22 +16171,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16733,10 +16209,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16746,8 +16218,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16787,22 +16259,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16825,10 +16297,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16838,8 +16306,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16879,22 +16347,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -16917,10 +16385,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -16930,8 +16394,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -16983,37 +16447,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17042,10 +16506,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17055,8 +16515,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17106,37 +16566,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17165,10 +16625,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17178,8 +16634,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17229,37 +16685,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17288,10 +16744,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17301,8 +16753,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17352,37 +16804,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17411,10 +16863,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17424,8 +16872,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17475,37 +16923,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17534,10 +16982,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17547,8 +16991,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17598,37 +17042,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17657,10 +17101,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17670,8 +17110,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17721,37 +17161,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17780,10 +17220,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17793,8 +17229,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17844,37 +17280,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -17903,10 +17339,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -17916,8 +17348,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -17967,37 +17399,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/bloaty", @@ -18026,10 +17458,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -18039,8 +17467,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -18062,7 +17490,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -18108,7 +17536,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -18154,7 +17582,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -18200,7 +17628,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -18826,32 +18254,32 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -18888,9 +18316,6 @@ "pool:SkiaCT", "os:Debian-10.3" ], - "environment": { - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "GOROOT": [ "go/go" @@ -18904,6 +18329,9 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], + "VPYTHON_LOG_TRACE": [ + "1" + ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" ] @@ -18937,17 +18365,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -19037,42 +18465,42 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build", "path": "recipe_bundle", - "version": "git_revision:1a28cb094add070f4beefd052725223930d8c27a" + "version": "git_revision:a8bcedad6768e206c4d2bd1718caa849f29cd42d" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -19091,10 +18519,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -19104,8 +18528,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -19153,37 +18577,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -19205,10 +18629,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -19218,8 +18638,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -19257,17 +18677,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -19325,17 +18745,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -19393,17 +18813,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -19438,12 +18858,6 @@ "idempotent": true }, "Housekeeper-PerCommit-BundleRecipes": { - "caches": [ - { - "name": "vpython", - "path": "cache/vpython" - } - ], "casSpec": "recipes", "cipd_packages": [ { @@ -19459,27 +18873,27 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -19494,20 +18908,10 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ - "cipd_bin_packages/cpython", - "cipd_bin_packages/cpython/bin", - "cipd_bin_packages/cpython3", - "cipd_bin_packages/cpython3/bin", "cipd_bin_packages", "cipd_bin_packages/bin" - ], - "VPYTHON_VIRTUALENV_ROOT": [ - "cache/vpython" ] }, "idempotent": true @@ -19558,37 +18962,37 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ccache_linux", @@ -19625,10 +19029,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "GOROOT": [ "go/go" @@ -19642,8 +19042,8 @@ "cipd_bin_packages/bin", "go/go/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -19677,17 +19077,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -19761,17 +19161,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -19863,7 +19263,7 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/gsutil", @@ -19873,32 +19273,32 @@ { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -19925,10 +19325,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "GOROOT": [ "go/go" @@ -19942,8 +19338,8 @@ "cipd_bin_packages/bin", "go/go/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20098,17 +19494,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20177,17 +19573,17 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20258,12 +19654,12 @@ { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20286,9 +19682,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20296,6 +19689,9 @@ "cipd_bin_packages/cpython3", "cipd_bin_packages/cpython3/bin" ], + "VPYTHON_LOG_TRACE": [ + "1" + ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" ] @@ -20344,32 +19740,32 @@ { "name": "infra/3pp/tools/git/linux-amd64", "path": "cipd_bin_packages", - "version": "version:2@2.34.0-rc2.chromium.6" + "version": "version:2@2.34.0-rc1.chromium.6" }, { "name": "infra/tools/git/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/git-credential-luci/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/go", @@ -20405,9 +19801,6 @@ "pool:SkiaCT", "os:Debian-10.3" ], - "environment": { - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "GOROOT": [ "go/go" @@ -20421,6 +19814,9 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], + "VPYTHON_LOG_TRACE": [ + "1" + ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" ] @@ -20452,22 +19848,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20492,10 +19888,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20505,8 +19897,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20545,22 +19937,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -20590,10 +19982,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20603,8 +19991,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20643,22 +20031,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20683,10 +20071,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20696,8 +20080,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20736,22 +20120,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20775,10 +20159,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20788,8 +20168,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20828,22 +20208,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20867,10 +20247,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20880,8 +20256,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -20920,22 +20296,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -20959,10 +20335,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -20972,8 +20344,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21012,22 +20384,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21052,10 +20424,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21065,8 +20433,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21105,22 +20473,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21144,10 +20512,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21157,8 +20521,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21197,22 +20561,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21236,10 +20600,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21249,8 +20609,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21289,22 +20649,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21329,10 +20689,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21342,8 +20698,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21382,22 +20738,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21422,10 +20778,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21435,8 +20787,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21475,22 +20827,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21515,10 +20867,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21528,8 +20876,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21568,22 +20916,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21608,10 +20956,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21621,8 +20965,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21661,22 +21005,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/text_blob_traces", @@ -21706,10 +21050,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21719,8 +21059,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21759,22 +21099,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21799,10 +21139,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21812,8 +21148,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21852,22 +21188,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21892,10 +21228,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21905,8 +21237,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -21945,22 +21277,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -21985,10 +21317,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -21998,8 +21326,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22038,22 +21366,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22078,10 +21406,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22091,8 +21415,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22131,22 +21455,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22170,10 +21494,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22183,8 +21503,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22223,22 +21543,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22262,10 +21582,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22275,8 +21591,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22315,22 +21631,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22354,10 +21670,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22367,8 +21679,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22407,22 +21719,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22447,10 +21759,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22460,8 +21768,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22500,22 +21808,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22540,10 +21848,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22553,8 +21857,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22593,22 +21897,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22633,10 +21937,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22646,8 +21946,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22686,22 +21986,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22726,10 +22026,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22739,8 +22035,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22779,22 +22075,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22819,10 +22115,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22832,8 +22124,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22872,22 +22164,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -22912,10 +22204,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -22925,8 +22213,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -22965,22 +22253,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/text_blob_traces", @@ -23010,10 +22298,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23023,8 +22307,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23063,22 +22347,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23103,10 +22387,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23116,8 +22396,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23156,22 +22436,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23196,10 +22476,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23209,8 +22485,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23249,22 +22525,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23289,10 +22565,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23302,8 +22574,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23342,22 +22614,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23381,10 +22653,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23394,8 +22662,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23434,22 +22702,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23473,10 +22741,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23486,8 +22750,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23526,22 +22790,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23566,10 +22830,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23579,8 +22839,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23619,22 +22879,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23658,10 +22918,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23671,8 +22927,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23711,22 +22967,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23750,10 +23006,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23763,8 +23015,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23803,22 +23055,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23843,10 +23095,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23856,8 +23104,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23896,22 +23144,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -23936,10 +23184,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -23949,8 +23193,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -23989,22 +23233,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -24029,10 +23273,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24042,8 +23282,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24082,22 +23322,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -24122,10 +23362,6 @@ "pool:Skia", "release_version:14092.77.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24135,8 +23371,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24175,22 +23411,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -24215,10 +23451,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24228,8 +23460,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24268,22 +23500,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -24308,10 +23540,6 @@ "pool:Skia", "release_version:14150.39.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24321,8 +23549,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24361,22 +23589,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -24401,10 +23629,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24414,8 +23638,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24454,22 +23678,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -24511,10 +23735,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24524,8 +23744,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24564,22 +23784,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -24621,10 +23841,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24634,8 +23850,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24674,22 +23890,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -24726,10 +23942,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24739,8 +23951,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24779,22 +23991,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -24831,10 +24043,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24844,8 +24052,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24884,22 +24092,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -24936,10 +24144,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -24949,8 +24153,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -24989,22 +24193,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -25041,10 +24245,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25054,8 +24254,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25094,22 +24294,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -25151,10 +24351,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25164,8 +24360,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25204,22 +24400,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -25256,10 +24452,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25269,8 +24461,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25309,22 +24501,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -25360,10 +24552,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25373,8 +24561,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25413,22 +24601,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -25465,10 +24653,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25478,8 +24662,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25518,22 +24702,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -25574,10 +24758,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25587,8 +24767,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25627,22 +24807,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -25688,10 +24868,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25701,8 +24877,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25741,22 +24917,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -25807,10 +24983,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25820,8 +24992,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25860,22 +25032,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -25916,10 +25088,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -25929,8 +25097,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -25969,22 +25137,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -26030,10 +25198,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26043,8 +25207,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26083,22 +25247,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -26144,10 +25308,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26157,8 +25317,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26197,22 +25357,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -26253,10 +25413,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26266,8 +25422,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26306,22 +25462,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -26362,10 +25518,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26375,8 +25527,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26415,22 +25567,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -26453,10 +25605,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26466,8 +25614,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26506,22 +25654,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -26544,10 +25692,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26557,8 +25701,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26581,7 +25725,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -26651,7 +25795,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -26723,7 +25867,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -26811,22 +25955,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -26872,10 +26016,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26885,8 +26025,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -26925,22 +26065,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -26976,10 +26116,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -26989,8 +26125,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27029,22 +26165,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27080,10 +26216,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27093,8 +26225,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27133,22 +26265,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27184,10 +26316,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27197,8 +26325,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27237,22 +26365,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27288,10 +26416,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27301,8 +26425,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27341,22 +26465,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27392,10 +26516,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27405,8 +26525,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27445,22 +26565,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27497,10 +26617,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27510,8 +26626,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27550,22 +26666,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27602,10 +26718,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27615,8 +26727,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27655,22 +26767,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27706,10 +26818,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27719,8 +26827,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27759,22 +26867,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27810,10 +26918,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27823,8 +26927,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27863,22 +26967,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -27914,10 +27018,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -27927,8 +27027,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -27967,22 +27067,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -28018,10 +27118,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28031,8 +27127,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28071,22 +27167,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -28122,10 +27218,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28135,8 +27227,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28175,22 +27267,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -28221,10 +27313,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28234,8 +27322,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28274,22 +27362,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -28320,10 +27408,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28333,8 +27417,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28373,22 +27457,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -28419,10 +27503,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28432,8 +27512,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28472,22 +27552,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -28528,10 +27608,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28541,8 +27617,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28581,22 +27657,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -28632,10 +27708,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28645,8 +27717,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28685,22 +27757,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -28741,10 +27813,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28754,8 +27822,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28794,22 +27862,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -28845,10 +27913,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28858,8 +27922,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -28898,22 +27962,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -28955,10 +28019,6 @@ "pool:Skia", "valgrind:1" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -28968,8 +28028,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29008,22 +28068,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -29064,10 +28124,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -29077,8 +28133,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29101,7 +28157,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29170,7 +28226,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29239,7 +28295,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29310,7 +28366,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29381,7 +28437,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29452,7 +28508,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -29539,22 +28595,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -29600,10 +28656,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -29613,8 +28665,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29653,22 +28705,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/lottie-samples", @@ -29713,10 +28765,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -29726,8 +28774,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29766,22 +28814,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -29817,10 +28865,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -29830,8 +28874,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29870,22 +28914,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -29921,10 +28965,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -29934,8 +28974,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -29974,22 +29014,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30020,10 +29060,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30033,8 +29069,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30073,22 +29109,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -30124,10 +29160,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30137,8 +29169,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30177,22 +29209,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30223,10 +29255,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30236,8 +29264,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30276,22 +29304,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -30327,10 +29355,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30340,8 +29364,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30380,22 +29404,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -30431,10 +29455,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30444,8 +29464,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30484,22 +29504,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30530,10 +29550,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30543,8 +29559,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30583,22 +29599,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -30634,10 +29650,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30647,8 +29659,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30687,22 +29699,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30733,10 +29745,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30746,8 +29754,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30786,22 +29794,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30832,10 +29840,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30845,8 +29849,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30885,22 +29889,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mskp", @@ -30931,10 +29935,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -30944,8 +29944,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -30984,22 +29984,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31035,10 +30035,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31048,8 +30044,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31088,22 +30084,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31139,10 +30135,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31152,8 +30144,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31192,22 +30184,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31243,10 +30235,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31256,8 +30244,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31296,22 +30284,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31347,10 +30335,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31360,8 +30344,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31400,22 +30384,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31451,10 +30435,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31464,8 +30444,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31504,22 +30484,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31555,10 +30535,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31568,8 +30544,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31608,22 +30584,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31659,10 +30635,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31672,8 +30644,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31712,22 +30684,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31763,10 +30735,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31776,8 +30744,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31816,22 +30784,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31867,10 +30835,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31880,8 +30844,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -31920,22 +30884,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -31971,10 +30935,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -31984,8 +30944,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32024,22 +30984,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32075,10 +31035,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32088,8 +31044,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32128,22 +31084,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32179,10 +31135,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32192,8 +31144,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32232,22 +31184,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32283,10 +31235,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32296,8 +31244,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32336,22 +31284,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32387,10 +31335,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32400,8 +31344,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32440,22 +31384,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32491,10 +31435,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32504,8 +31444,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32544,22 +31484,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32595,10 +31535,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32608,8 +31544,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32648,22 +31584,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32699,10 +31635,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32712,8 +31644,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32752,22 +31684,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32803,10 +31735,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32816,8 +31744,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32856,22 +31784,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -32907,10 +31835,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -32920,8 +31844,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -32960,22 +31884,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -33011,10 +31935,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33024,8 +31944,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33064,22 +31984,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -33115,10 +32035,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33128,8 +32044,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33168,22 +32084,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -33220,10 +32136,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33233,8 +32145,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33273,22 +32185,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -33325,10 +32237,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33338,8 +32246,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33378,22 +32286,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -33430,10 +32338,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33443,8 +32347,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33483,22 +32387,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -33527,10 +32431,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33540,8 +32440,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33580,22 +32480,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -33624,10 +32524,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33637,8 +32533,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33677,22 +32573,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -33721,10 +32617,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33734,8 +32626,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33774,22 +32666,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -33818,10 +32710,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33831,8 +32719,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33871,22 +32759,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -33915,10 +32803,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -33928,8 +32812,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -33968,22 +32852,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -34012,10 +32896,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34025,8 +32905,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34065,22 +32945,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -34109,10 +32989,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34122,8 +32998,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34162,22 +33038,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -34206,10 +33082,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34219,8 +33091,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34259,22 +33131,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -34303,10 +33175,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34316,8 +33184,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34356,22 +33224,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -34400,10 +33268,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34413,8 +33277,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34458,22 +33322,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34498,10 +33362,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34511,8 +33371,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34557,22 +33417,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34597,10 +33457,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34610,8 +33466,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34656,22 +33512,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34696,10 +33552,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34709,8 +33561,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34755,22 +33607,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34795,10 +33647,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34808,8 +33656,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34854,22 +33702,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34894,10 +33742,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -34907,8 +33751,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -34953,22 +33797,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -34993,10 +33837,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35006,8 +33846,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35052,22 +33892,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35092,10 +33932,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35105,8 +33941,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35151,22 +33987,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35191,10 +34027,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35204,8 +34036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35250,22 +34082,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35290,10 +34122,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35303,8 +34131,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35349,22 +34177,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35389,10 +34217,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35402,8 +34226,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35448,22 +34272,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35488,10 +34312,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35501,8 +34321,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35547,22 +34367,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35587,10 +34407,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35600,8 +34416,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35646,22 +34462,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35686,10 +34502,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35699,8 +34511,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35745,22 +34557,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35785,10 +34597,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35798,8 +34606,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35844,22 +34652,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35884,10 +34692,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35897,8 +34701,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -35943,22 +34747,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -35983,10 +34787,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -35996,8 +34796,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36042,22 +34842,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36082,10 +34882,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36095,8 +34891,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36141,22 +34937,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36181,10 +34977,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36194,8 +34986,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36240,22 +35032,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36280,10 +35072,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36293,8 +35081,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36339,22 +35127,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36379,10 +35167,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36392,8 +35176,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36438,22 +35222,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36478,10 +35262,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36491,8 +35271,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36537,22 +35317,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36577,10 +35357,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36590,8 +35366,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36636,22 +35412,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36676,10 +35452,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36689,8 +35461,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36735,22 +35507,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36775,10 +35547,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36788,8 +35556,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36834,22 +35602,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36874,10 +35642,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36887,8 +35651,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -36933,22 +35697,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -36973,10 +35737,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -36986,8 +35746,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37032,22 +35792,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37072,10 +35832,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37085,8 +35841,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37131,22 +35887,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37171,10 +35927,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37184,8 +35936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37230,22 +35982,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37270,10 +36022,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37283,8 +36031,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37329,22 +36077,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37369,10 +36117,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37382,8 +36126,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37428,22 +36172,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37468,10 +36212,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37481,8 +36221,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37527,22 +36267,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37567,10 +36307,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37580,8 +36316,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37626,22 +36362,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37666,10 +36402,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37679,8 +36411,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37725,22 +36457,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37765,10 +36497,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37778,8 +36506,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37824,22 +36552,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37864,10 +36592,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37877,8 +36601,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -37923,22 +36647,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -37963,10 +36687,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -37976,8 +36696,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38022,22 +36742,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38062,10 +36782,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38075,8 +36791,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38121,22 +36837,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38161,10 +36877,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38174,8 +36886,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38220,22 +36932,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38260,10 +36972,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38273,8 +36981,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38319,22 +37027,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38359,10 +37067,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38372,8 +37076,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38418,22 +37122,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38458,10 +37162,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38471,8 +37171,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38517,22 +37217,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38557,10 +37257,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38570,8 +37266,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38616,22 +37312,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38656,10 +37352,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38669,8 +37361,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38715,22 +37407,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38755,10 +37447,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38768,8 +37456,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38814,22 +37502,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38854,10 +37542,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38867,8 +37551,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -38913,22 +37597,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -38953,10 +37637,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -38966,8 +37646,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39012,22 +37692,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39052,10 +37732,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39065,8 +37741,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39111,22 +37787,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39151,10 +37827,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39164,8 +37836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39210,22 +37882,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39250,10 +37922,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39263,8 +37931,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39309,22 +37977,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39349,10 +38017,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39362,8 +38026,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39408,22 +38072,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39448,10 +38112,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39461,8 +38121,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39502,22 +38162,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39543,10 +38203,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39556,8 +38212,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39596,22 +38252,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39637,10 +38293,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39650,8 +38302,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39695,22 +38347,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39735,10 +38387,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39748,8 +38396,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39794,22 +38442,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39834,10 +38482,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39847,8 +38491,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39893,22 +38537,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -39933,10 +38577,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -39946,8 +38586,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -39992,22 +38632,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40032,10 +38672,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40045,8 +38681,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40091,22 +38727,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40131,10 +38767,6 @@ "os:Android", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40144,8 +38776,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40190,22 +38822,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40230,10 +38862,6 @@ "pool:Skia", "release_version:14092.77.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40243,8 +38871,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40289,22 +38917,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40329,10 +38957,6 @@ "pool:Skia", "release_version:14092.77.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40342,8 +38966,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40388,22 +39012,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40428,10 +39052,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40441,8 +39061,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40487,22 +39107,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40527,10 +39147,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40540,8 +39156,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40586,22 +39202,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40626,10 +39242,6 @@ "pool:Skia", "release_version:14150.39.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40639,8 +39251,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40685,22 +39297,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40725,10 +39337,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40738,8 +39346,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40784,22 +39392,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -40824,10 +39432,6 @@ "pool:Skia", "release_version:14233.0.0" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40837,8 +39441,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40883,22 +39487,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -40935,10 +39539,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -40948,8 +39548,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -40994,22 +39594,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41046,10 +39646,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41059,8 +39655,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41105,22 +39701,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41157,10 +39753,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41170,8 +39762,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41216,22 +39808,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41268,10 +39860,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41281,8 +39869,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41327,22 +39915,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41379,10 +39967,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41392,8 +39976,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41438,22 +40022,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41490,10 +40074,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41503,8 +40083,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41549,22 +40129,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41601,10 +40181,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41614,8 +40190,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41660,22 +40236,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41712,10 +40288,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41725,8 +40297,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41771,22 +40343,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41823,10 +40395,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41836,8 +40404,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41882,22 +40450,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -41934,10 +40502,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -41947,8 +40511,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -41993,22 +40557,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42045,10 +40609,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42058,8 +40618,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42104,22 +40664,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42156,10 +40716,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42169,8 +40725,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42215,22 +40771,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42267,10 +40823,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42280,8 +40832,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42326,22 +40878,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42378,10 +40930,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42391,8 +40939,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42437,22 +40985,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42489,10 +41037,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42502,8 +41046,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42548,22 +41092,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42600,10 +41144,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42613,8 +41153,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42659,22 +41199,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42710,10 +41250,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42723,8 +41259,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42769,22 +41305,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42820,10 +41356,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42833,8 +41365,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42879,22 +41411,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -42930,10 +41462,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -42943,8 +41471,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -42989,22 +41517,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -43040,10 +41568,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43053,8 +41577,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43099,22 +41623,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -43151,10 +41675,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43164,8 +41684,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43205,22 +41725,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -43262,10 +41782,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43275,8 +41791,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43320,22 +41836,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -43372,10 +41888,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43385,8 +41897,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43431,22 +41943,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -43487,10 +41999,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43500,8 +42008,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43546,22 +42054,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -43607,10 +42115,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43620,8 +42124,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43666,22 +42170,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -43722,10 +42226,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43735,8 +42235,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43781,22 +42281,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -43842,10 +42342,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43855,8 +42351,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -43901,22 +42397,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -43957,10 +42453,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -43970,8 +42462,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44011,22 +42503,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -44077,10 +42569,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44090,8 +42578,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44135,22 +42623,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -44191,10 +42679,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44204,8 +42688,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44250,22 +42734,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -44311,10 +42795,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44324,8 +42804,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44365,22 +42845,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -44426,10 +42906,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44439,8 +42915,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44479,22 +42955,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -44545,10 +43021,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44558,8 +43030,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44598,22 +43070,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -44659,10 +43131,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44672,8 +43140,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44712,22 +43180,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -44778,10 +43246,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44791,8 +43255,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44836,22 +43300,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -44892,10 +43356,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -44905,8 +43365,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -44946,22 +43406,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -45007,10 +43467,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45020,8 +43476,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45060,22 +43516,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -45126,10 +43582,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45139,8 +43591,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45179,22 +43631,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -45240,10 +43692,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45253,8 +43701,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45293,22 +43741,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -45359,10 +43807,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45372,8 +43816,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45412,22 +43856,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -45473,10 +43917,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45486,8 +43926,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45531,22 +43971,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -45592,10 +44032,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45605,8 +44041,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45651,22 +44087,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -45707,10 +44143,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45720,8 +44152,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45766,22 +44198,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -45822,10 +44254,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45835,8 +44263,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45881,22 +44309,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -45937,10 +44365,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -45950,8 +44374,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -45996,22 +44420,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/mesa_intel_driver_linux", @@ -46052,10 +44476,6 @@ "os:Debian-10.10", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46065,8 +44485,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46111,22 +44531,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -46149,10 +44569,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46162,8 +44578,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46208,22 +44624,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -46246,10 +44662,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46259,8 +44671,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46305,22 +44717,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -46343,10 +44755,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46356,8 +44764,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46402,22 +44810,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -46440,10 +44848,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46453,8 +44857,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46499,22 +44903,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -46552,10 +44956,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46565,8 +44965,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46611,22 +45011,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -46664,10 +45064,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46677,8 +45073,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46723,22 +45119,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -46776,10 +45172,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46789,8 +45181,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46835,22 +45227,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -46888,10 +45280,6 @@ "pool:Skia", "docker_installed:true" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -46901,8 +45289,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -46947,22 +45335,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -46998,10 +45386,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47011,8 +45395,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47057,22 +45441,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47108,10 +45492,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47121,8 +45501,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47167,22 +45547,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47218,10 +45598,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47231,8 +45607,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47277,22 +45653,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47328,10 +45704,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47341,8 +45713,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47387,22 +45759,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47438,10 +45810,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47451,8 +45819,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47497,22 +45865,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47548,10 +45916,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47561,8 +45925,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47607,22 +45971,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47658,10 +46022,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47671,8 +46031,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47712,22 +46072,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47763,10 +46123,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47776,8 +46132,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47821,22 +46177,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47872,10 +46228,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47885,8 +46237,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -47931,22 +46283,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -47982,10 +46334,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -47995,8 +46343,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48036,22 +46384,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48087,10 +46435,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48100,8 +46444,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48145,22 +46489,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48197,10 +46541,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48210,8 +46550,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48256,22 +46596,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48308,10 +46648,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48321,8 +46657,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48367,22 +46703,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48419,10 +46755,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48432,8 +46764,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48478,22 +46810,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48529,10 +46861,6 @@ "os:Mac-10.13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48542,8 +46870,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48588,22 +46916,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48639,10 +46967,6 @@ "os:Mac-10.14.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48652,8 +46976,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48698,22 +47022,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48749,10 +47073,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48762,8 +47082,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48803,22 +47123,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48854,10 +47174,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48867,8 +47183,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -48912,22 +47228,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -48963,10 +47279,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -48976,8 +47288,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49022,22 +47334,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49073,10 +47385,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49086,8 +47394,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49132,22 +47440,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49183,10 +47491,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49196,8 +47500,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49242,22 +47546,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49293,10 +47597,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49306,8 +47606,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49352,22 +47652,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49403,10 +47703,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49416,8 +47712,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49462,22 +47758,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49513,10 +47809,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49526,8 +47818,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49572,22 +47864,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49623,10 +47915,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49636,8 +47924,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49682,22 +47970,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49733,10 +48021,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49746,8 +48030,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49792,22 +48076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49843,10 +48127,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49856,8 +48136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -49902,22 +48182,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -49953,10 +48233,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -49966,8 +48242,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50012,22 +48288,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50063,10 +48339,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50076,8 +48348,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50117,22 +48389,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50168,10 +48440,6 @@ "os:Mac-10.15.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50181,8 +48449,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50226,22 +48494,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50277,10 +48545,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50290,8 +48554,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50336,22 +48600,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50387,10 +48651,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50400,8 +48660,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50446,22 +48706,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50497,10 +48757,6 @@ "os:Mac-10.15.7", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50510,8 +48766,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50556,22 +48812,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50607,10 +48863,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50620,8 +48872,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50666,22 +48918,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50717,10 +48969,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50730,8 +48978,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50776,22 +49024,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50827,10 +49075,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50840,8 +49084,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50881,22 +49125,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -50932,10 +49176,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -50945,8 +49185,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -50990,22 +49230,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -51041,10 +49281,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51054,8 +49290,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51095,22 +49331,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -51146,10 +49382,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51159,8 +49391,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51204,22 +49436,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -51255,10 +49487,6 @@ "os:Mac-11.4", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51268,8 +49496,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51309,22 +49537,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -51365,10 +49593,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51378,8 +49602,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51423,22 +49647,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -51474,10 +49698,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51487,8 +49707,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51533,22 +49753,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -51589,10 +49809,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51602,8 +49818,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51643,22 +49859,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -51699,10 +49915,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51712,8 +49924,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51757,22 +49969,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -51813,10 +50025,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51826,8 +50034,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51867,22 +50075,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -51923,10 +50131,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -51936,8 +50140,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -51981,22 +50185,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -52037,10 +50241,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52050,8 +50250,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52091,22 +50291,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -52142,10 +50342,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52155,8 +50351,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52200,22 +50396,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -52256,10 +50452,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52269,8 +50461,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52315,22 +50507,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -52366,10 +50558,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52379,8 +50567,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52420,22 +50608,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -52476,10 +50664,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52489,8 +50673,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52529,22 +50713,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -52590,10 +50774,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52603,8 +50783,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52643,22 +50823,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -52699,10 +50879,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52712,8 +50888,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52752,22 +50928,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -52813,10 +50989,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52826,8 +50998,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52866,22 +51038,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -52917,10 +51089,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -52930,8 +51098,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -52970,22 +51138,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/clang_linux", @@ -53031,10 +51199,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53044,8 +51208,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53084,22 +51248,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53141,10 +51305,6 @@ "pool:Skia", "valgrind:1" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53154,8 +51314,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53194,22 +51354,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53251,10 +51411,6 @@ "pool:Skia", "valgrind:1" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53264,8 +51420,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53304,22 +51460,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53361,10 +51517,6 @@ "pool:Skia", "valgrind:1" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53374,8 +51526,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53419,22 +51571,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/linux_vulkan_sdk", @@ -53475,10 +51627,6 @@ "os:Ubuntu-18.04", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53488,8 +51636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53513,7 +51661,7 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/node", @@ -53523,7 +51671,7 @@ { "name": "skia/tools/goldctl/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -53618,22 +51766,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53669,10 +51817,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53682,8 +51826,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53722,22 +51866,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53773,10 +51917,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53786,8 +51926,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53826,22 +51966,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53877,10 +52017,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53890,8 +52026,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -53930,22 +52066,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -53981,10 +52117,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -53994,8 +52126,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54034,22 +52166,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54085,10 +52217,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54098,8 +52226,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54138,22 +52266,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54189,10 +52317,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54202,8 +52326,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54242,22 +52366,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54293,10 +52417,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54306,8 +52426,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54346,22 +52466,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54397,10 +52517,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54410,8 +52526,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54450,22 +52566,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54501,10 +52617,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54514,8 +52626,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54554,22 +52666,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54605,10 +52717,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54618,8 +52726,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54658,22 +52766,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54709,10 +52817,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54722,8 +52826,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54762,22 +52866,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54813,10 +52917,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54826,8 +52926,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54866,22 +52966,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -54917,10 +53017,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -54930,8 +53026,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -54970,22 +53066,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/procdump_win", @@ -55026,10 +53122,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55039,8 +53131,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55079,22 +53171,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55130,10 +53222,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55143,8 +53231,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55183,22 +53271,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55234,10 +53322,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55247,8 +53331,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55287,22 +53371,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55338,10 +53422,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55351,8 +53431,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55391,22 +53471,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55442,10 +53522,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55455,8 +53531,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55495,22 +53571,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55546,10 +53622,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55559,8 +53631,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55599,22 +53671,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/procdump_win", @@ -55655,10 +53727,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55668,8 +53736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55708,22 +53776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55759,10 +53827,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55772,8 +53836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55812,22 +53876,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55863,10 +53927,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55876,8 +53936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -55916,22 +53976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -55967,10 +54027,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -55980,8 +54036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56020,22 +54076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56071,10 +54127,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56084,8 +54136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56124,22 +54176,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56175,10 +54227,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56188,8 +54236,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56228,22 +54276,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56279,10 +54327,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56292,8 +54336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56332,22 +54376,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56383,10 +54427,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56396,8 +54436,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56436,22 +54476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56487,10 +54527,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56500,8 +54536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56540,22 +54576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56591,10 +54627,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56604,8 +54636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56644,22 +54676,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56695,10 +54727,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56708,8 +54736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56748,22 +54776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56799,10 +54827,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56812,8 +54836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56852,22 +54876,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -56903,10 +54927,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -56916,8 +54936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -56956,22 +54976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57007,10 +55027,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57020,8 +55036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57060,22 +55076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57111,10 +55127,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57124,8 +55136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57164,22 +55176,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57215,10 +55227,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57228,8 +55236,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57268,22 +55276,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57319,10 +55327,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57332,8 +55336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57372,22 +55376,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57423,10 +55427,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57436,8 +55436,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57476,22 +55476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57527,10 +55527,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57540,8 +55536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57580,22 +55576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57631,10 +55627,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57644,8 +55636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57684,22 +55676,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57735,10 +55727,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57748,8 +55736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57788,22 +55776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57839,10 +55827,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57852,8 +55836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57892,22 +55876,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -57943,10 +55927,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -57956,8 +55936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -57996,22 +55976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58047,10 +56027,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58060,8 +56036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58100,22 +56076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58151,10 +56127,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58164,8 +56136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58204,22 +56176,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58255,10 +56227,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58268,8 +56236,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58308,22 +56276,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58359,10 +56327,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58372,8 +56336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58412,22 +56376,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58463,10 +56427,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58476,8 +56436,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58516,22 +56476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58567,10 +56527,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58580,8 +56536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58620,22 +56576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58671,10 +56627,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58684,8 +56636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58724,22 +56676,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58775,10 +56727,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58788,8 +56736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58828,22 +56776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58879,10 +56827,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58892,8 +56836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -58932,22 +56876,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -58983,10 +56927,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -58996,8 +56936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59036,22 +56976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59087,10 +57027,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59100,8 +57036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59140,22 +57076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59191,10 +57127,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59204,8 +57136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59244,22 +57176,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59295,10 +57227,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59308,8 +57236,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59348,22 +57276,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59399,10 +57327,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59412,8 +57336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59452,22 +57376,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59503,10 +57427,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59516,8 +57436,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59556,22 +57476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59607,10 +57527,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59620,8 +57536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59660,22 +57576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59711,10 +57627,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59724,8 +57636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59764,22 +57676,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59815,10 +57727,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59828,8 +57736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59868,22 +57776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -59919,10 +57827,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -59932,8 +57836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -59972,22 +57876,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60023,10 +57927,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60036,8 +57936,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60076,22 +57976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60127,10 +58027,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60140,8 +58036,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60180,22 +58076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60231,10 +58127,6 @@ "os:Windows-10-19041", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60244,8 +58136,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60284,22 +58176,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60335,10 +58227,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60348,8 +58236,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60388,22 +58276,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60439,10 +58327,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60452,8 +58336,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60492,22 +58376,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60543,10 +58427,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60556,8 +58436,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60596,22 +58476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60647,10 +58527,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60660,8 +58536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60700,22 +58576,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60751,10 +58627,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60764,8 +58636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60804,22 +58676,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60855,10 +58727,6 @@ "os:Windows-10-19043", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60868,8 +58736,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -60908,22 +58776,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -60960,10 +58828,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -60973,8 +58837,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61013,22 +58877,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61065,10 +58929,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61078,8 +58938,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61118,22 +58978,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61170,10 +59030,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61183,8 +59039,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61223,22 +59079,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61275,10 +59131,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61288,8 +59140,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61328,22 +59180,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61380,10 +59232,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61393,8 +59241,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61433,22 +59281,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61485,10 +59333,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61498,8 +59342,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61538,22 +59382,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61590,10 +59434,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61603,8 +59443,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61643,22 +59483,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61695,10 +59535,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61708,8 +59544,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61748,22 +59584,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61800,10 +59636,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61813,8 +59645,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61853,22 +59685,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -61905,10 +59737,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -61918,8 +59746,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -61958,22 +59786,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62010,10 +59838,6 @@ "os:Windows-Server-17763", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62023,8 +59847,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62063,22 +59887,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62114,10 +59938,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62127,8 +59947,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62167,22 +59987,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62218,10 +60038,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62231,8 +60047,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62271,22 +60087,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62322,10 +60138,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62335,8 +60147,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62375,22 +60187,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62426,10 +60238,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62439,8 +60247,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62479,22 +60287,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62530,10 +60338,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62543,8 +60347,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62583,22 +60387,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62634,10 +60438,6 @@ "os:Windows-7-SP1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62647,8 +60447,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62687,22 +60487,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62738,10 +60538,6 @@ "os:Windows-8.1-SP0", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62751,8 +60547,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62791,22 +60587,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62842,10 +60638,6 @@ "os:Windows-8.1-SP0", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62855,8 +60647,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62895,22 +60687,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -62946,10 +60738,6 @@ "os:Windows-8.1-SP0", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -62959,8 +60747,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -62999,22 +60787,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/skimage", @@ -63050,10 +60838,6 @@ "os:Windows-8.1-SP0", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63063,8 +60847,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63108,22 +60892,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -63152,10 +60936,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63165,8 +60945,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63211,22 +60991,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -63255,10 +61035,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63268,8 +61044,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63314,22 +61090,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -63358,10 +61134,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63371,8 +61143,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63417,22 +61189,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -63461,10 +61233,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63474,8 +61242,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63520,22 +61288,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -63564,10 +61332,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63577,8 +61341,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63623,22 +61387,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -63667,10 +61431,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63680,8 +61440,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63726,22 +61486,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -63770,10 +61530,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63783,8 +61539,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63829,22 +61585,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-12.4", @@ -63873,10 +61629,6 @@ "os:iOS-12.4.5", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63886,8 +61638,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -63932,22 +61684,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -63976,10 +61728,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -63989,8 +61737,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64035,22 +61783,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64079,10 +61827,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64092,8 +61836,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64138,22 +61882,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64182,10 +61926,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64195,8 +61935,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64241,22 +61981,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64285,10 +62025,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64298,8 +62034,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64344,22 +62080,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64388,10 +62124,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64401,8 +62133,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64447,22 +62179,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64491,10 +62223,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64504,8 +62232,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64550,22 +62278,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64594,10 +62322,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64607,8 +62331,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64653,22 +62377,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.3", @@ -64697,10 +62421,6 @@ "os:iOS-13.3.1", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64710,8 +62430,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64756,22 +62476,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -64800,10 +62520,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64813,8 +62529,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64859,22 +62575,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -64903,10 +62619,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -64916,8 +62628,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -64962,22 +62674,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -65006,10 +62718,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65019,8 +62727,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65065,22 +62773,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "skia/bots/ios-dev-image-13.6", @@ -65109,10 +62817,6 @@ "os:iOS-13.6", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65122,8 +62826,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65168,22 +62872,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65206,10 +62910,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65219,8 +62919,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65261,22 +62961,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65299,10 +62999,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65312,8 +63008,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65354,22 +63050,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65392,10 +63088,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65405,8 +63097,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65447,22 +63139,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65485,10 +63177,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65498,8 +63186,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65540,22 +63228,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65578,10 +63266,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65591,8 +63275,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65633,22 +63317,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65671,10 +63355,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65684,8 +63364,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65726,22 +63406,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65764,10 +63444,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65777,8 +63453,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65819,22 +63495,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65857,10 +63533,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65870,8 +63542,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -65912,22 +63584,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -65950,10 +63622,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -65963,8 +63631,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66005,22 +63673,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66043,10 +63711,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66056,8 +63720,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66098,22 +63762,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66136,10 +63800,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66149,8 +63809,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66191,22 +63851,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66229,10 +63889,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66242,8 +63898,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66284,22 +63940,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66322,10 +63978,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66335,8 +63987,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66377,22 +64029,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66415,10 +64067,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66428,8 +64076,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66470,22 +64118,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66508,10 +64156,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66521,8 +64165,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66563,22 +64207,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66601,10 +64245,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66614,8 +64254,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66656,22 +64296,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66694,10 +64334,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66707,8 +64343,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66749,22 +64385,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66787,10 +64423,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66800,8 +64432,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66842,22 +64474,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66880,10 +64512,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66893,8 +64521,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -66935,22 +64563,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -66973,10 +64601,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -66986,8 +64610,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67028,22 +64652,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67066,10 +64690,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67079,8 +64699,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67121,22 +64741,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67159,10 +64779,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67172,8 +64788,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67214,22 +64830,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67252,10 +64868,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67265,8 +64877,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67307,22 +64919,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67345,10 +64957,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67358,8 +64966,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67400,22 +65008,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67438,10 +65046,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67451,8 +65055,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67493,22 +65097,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67531,10 +65135,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67544,8 +65144,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67586,22 +65186,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67624,10 +65224,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67637,8 +65233,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67679,22 +65275,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67717,10 +65313,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67730,8 +65322,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67772,22 +65364,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67810,10 +65402,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67823,8 +65411,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67865,22 +65453,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67903,10 +65491,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -67916,8 +65500,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -67958,22 +65542,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -67996,10 +65580,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68009,8 +65589,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68051,22 +65631,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68089,10 +65669,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68102,8 +65678,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68144,22 +65720,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68182,10 +65758,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68195,8 +65767,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68237,22 +65809,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68275,10 +65847,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68288,8 +65856,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68330,22 +65898,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68368,10 +65936,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68381,8 +65945,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68423,22 +65987,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68461,10 +66025,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68474,8 +66034,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68516,22 +66076,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68554,10 +66114,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68567,8 +66123,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68609,22 +66165,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68647,10 +66203,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68660,8 +66212,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68702,22 +66254,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68740,10 +66292,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68753,8 +66301,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68795,22 +66343,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68833,10 +66381,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68846,8 +66390,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68888,22 +66432,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -68926,10 +66470,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -68939,8 +66479,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -68981,22 +66521,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69019,10 +66559,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69032,8 +66568,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69074,22 +66610,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69112,10 +66648,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69125,8 +66657,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69167,22 +66699,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69205,10 +66737,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69218,8 +66746,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69260,22 +66788,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69298,10 +66826,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69311,8 +66835,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69353,22 +66877,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69391,10 +66915,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69404,8 +66924,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69446,22 +66966,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69484,10 +67004,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69497,8 +67013,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69539,22 +67055,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69577,10 +67093,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69590,8 +67102,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69632,22 +67144,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69670,10 +67182,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69683,8 +67191,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69725,22 +67233,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69763,10 +67271,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69776,8 +67280,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69818,22 +67322,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69856,10 +67360,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69869,8 +67369,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -69911,22 +67411,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -69949,10 +67449,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -69962,8 +67458,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70004,22 +67500,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70042,10 +67538,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70055,8 +67547,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70097,22 +67589,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70135,10 +67627,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70148,8 +67636,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70190,22 +67678,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70228,10 +67716,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70241,8 +67725,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70283,22 +67767,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70321,10 +67805,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70334,8 +67814,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70376,22 +67856,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70414,10 +67894,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70427,8 +67903,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70469,22 +67945,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70507,10 +67983,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70520,8 +67992,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70562,22 +68034,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70600,10 +68072,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70613,8 +68081,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70655,22 +68123,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70693,10 +68161,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70706,8 +68170,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70748,22 +68212,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70786,10 +68250,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70799,8 +68259,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70841,22 +68301,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70879,10 +68339,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70892,8 +68348,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -70934,22 +68390,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -70972,10 +68428,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -70985,8 +68437,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71027,22 +68479,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71065,10 +68517,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71078,8 +68526,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71120,22 +68568,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71158,10 +68606,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71171,8 +68615,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71213,22 +68657,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71251,10 +68695,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71264,8 +68704,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71306,22 +68746,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71344,10 +68784,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71357,8 +68793,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71399,22 +68835,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71437,10 +68873,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71450,8 +68882,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71492,22 +68924,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71530,10 +68962,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71543,8 +68971,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71585,22 +69013,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71623,10 +69051,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71636,8 +69060,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71678,22 +69102,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71716,10 +69140,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71729,8 +69149,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71771,22 +69191,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71809,10 +69229,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71822,8 +69238,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71864,22 +69280,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71902,10 +69318,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -71915,8 +69327,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -71957,22 +69369,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -71995,10 +69407,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72008,8 +69416,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72050,22 +69458,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72088,10 +69496,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72101,8 +69505,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72143,22 +69547,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72181,10 +69585,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72194,8 +69594,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72236,22 +69636,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72274,10 +69674,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72287,8 +69683,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72329,22 +69725,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72367,10 +69763,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72380,8 +69772,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72422,22 +69814,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72460,10 +69852,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72473,8 +69861,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72515,22 +69903,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72553,10 +69941,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72566,8 +69950,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72608,22 +69992,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72646,10 +70030,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72659,8 +70039,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72701,22 +70081,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72739,10 +70119,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72752,8 +70128,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72794,22 +70170,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72832,10 +70208,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72845,8 +70217,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72887,22 +70259,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -72925,10 +70297,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -72938,8 +70306,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -72980,22 +70348,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73018,10 +70386,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73031,8 +70395,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73073,22 +70437,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73111,10 +70475,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73124,8 +70484,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73166,22 +70526,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73204,10 +70564,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73217,8 +70573,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73259,22 +70615,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73297,10 +70653,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73310,8 +70662,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73352,22 +70704,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73390,10 +70742,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73403,8 +70751,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73445,22 +70793,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73483,10 +70831,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73496,8 +70840,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73538,22 +70882,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73576,10 +70920,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73589,8 +70929,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73631,22 +70971,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73669,10 +71009,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73682,8 +71018,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73724,22 +71060,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73762,10 +71098,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73775,8 +71107,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73817,22 +71149,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73855,10 +71187,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73868,8 +71196,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -73910,22 +71238,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -73948,10 +71276,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -73961,8 +71285,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74003,22 +71327,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74041,10 +71365,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74054,8 +71374,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74096,22 +71416,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74134,10 +71454,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74147,8 +71463,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74189,22 +71505,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74227,10 +71543,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74240,8 +71552,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74282,22 +71594,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74320,10 +71632,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74333,8 +71641,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74375,22 +71683,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74413,10 +71721,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74426,8 +71730,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74468,22 +71772,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74506,10 +71810,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74519,8 +71819,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74561,22 +71861,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74599,10 +71899,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74612,8 +71908,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74654,22 +71950,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74692,10 +71988,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74705,8 +71997,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74747,22 +72039,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74785,10 +72077,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74798,8 +72086,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74840,22 +72128,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74878,10 +72166,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74891,8 +72175,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -74933,22 +72217,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -74971,10 +72255,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -74984,8 +72264,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75026,22 +72306,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75064,10 +72344,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75077,8 +72353,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75119,22 +72395,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75157,10 +72433,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75170,8 +72442,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75212,22 +72484,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75250,10 +72522,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75263,8 +72531,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75305,22 +72573,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75343,10 +72611,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75356,8 +72620,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75398,22 +72662,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75436,10 +72700,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75449,8 +72709,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75491,22 +72751,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75529,10 +72789,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75542,8 +72798,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75584,22 +72840,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75622,10 +72878,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75635,8 +72887,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75677,22 +72929,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75715,10 +72967,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75728,8 +72976,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75770,22 +73018,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75808,10 +73056,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75821,8 +73065,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75863,22 +73107,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75901,10 +73145,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -75914,8 +73154,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -75956,22 +73196,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -75994,10 +73234,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76007,8 +73243,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76049,22 +73285,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76087,10 +73323,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76100,8 +73332,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76142,22 +73374,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76180,10 +73412,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76193,8 +73421,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76235,22 +73463,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76273,10 +73501,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76286,8 +73510,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76328,22 +73552,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76366,10 +73590,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76379,8 +73599,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76421,22 +73641,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76459,10 +73679,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76472,8 +73688,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76514,22 +73730,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76552,10 +73768,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76565,8 +73777,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76607,22 +73819,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76645,10 +73857,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76658,8 +73866,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76700,22 +73908,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76738,10 +73946,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76751,8 +73955,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76793,22 +73997,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76831,10 +74035,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76844,8 +74044,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76886,22 +74086,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -76924,10 +74124,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -76937,8 +74133,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -76979,22 +74175,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77017,10 +74213,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77030,8 +74222,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77072,22 +74264,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77110,10 +74302,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77123,8 +74311,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77165,22 +74353,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77203,10 +74391,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77216,8 +74400,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77258,22 +74442,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77296,10 +74480,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77309,8 +74489,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77351,22 +74531,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77389,10 +74569,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77402,8 +74578,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77444,22 +74620,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77482,10 +74658,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77495,8 +74667,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77537,22 +74709,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77575,10 +74747,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77588,8 +74756,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77630,22 +74798,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77668,10 +74836,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77681,8 +74845,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77723,22 +74887,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77761,10 +74925,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77774,8 +74934,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77816,22 +74976,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77854,10 +75014,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77867,8 +75023,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -77909,22 +75065,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -77947,10 +75103,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -77960,8 +75112,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78002,22 +75154,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78040,10 +75192,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78053,8 +75201,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78095,22 +75243,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78133,10 +75281,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78146,8 +75290,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78188,22 +75332,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78226,10 +75370,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78239,8 +75379,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78281,22 +75421,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78319,10 +75459,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78332,8 +75468,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78374,22 +75510,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78412,10 +75548,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78425,8 +75557,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78467,22 +75599,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78505,10 +75637,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78518,8 +75646,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78560,22 +75688,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78598,10 +75726,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78611,8 +75735,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78653,22 +75777,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78691,10 +75815,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78704,8 +75824,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78746,22 +75866,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78784,10 +75904,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78797,8 +75913,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78839,22 +75955,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78877,10 +75993,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78890,8 +76002,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -78932,22 +76044,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -78970,10 +76082,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -78983,8 +76091,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79025,22 +76133,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79063,10 +76171,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79076,8 +76180,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79118,22 +76222,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79156,10 +76260,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79169,8 +76269,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79211,22 +76311,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79249,10 +76349,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79262,8 +76358,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79304,22 +76400,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79342,10 +76438,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79355,8 +76447,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79397,22 +76489,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79435,10 +76527,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79448,8 +76536,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79490,22 +76578,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79528,10 +76616,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79541,8 +76625,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79583,22 +76667,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79621,10 +76705,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79634,8 +76714,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79676,22 +76756,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79714,10 +76794,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79727,8 +76803,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79769,22 +76845,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79807,10 +76883,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79820,8 +76892,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79862,22 +76934,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79900,10 +76972,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -79913,8 +76981,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -79955,22 +77023,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -79993,10 +77061,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80006,8 +77070,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80048,22 +77112,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80086,10 +77150,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80099,8 +77159,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80141,22 +77201,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80179,10 +77239,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80192,8 +77248,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80234,22 +77290,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80272,10 +77328,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80285,8 +77337,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80327,22 +77379,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80365,10 +77417,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80378,8 +77426,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80420,22 +77468,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80458,10 +77506,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80471,8 +77515,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80513,22 +77557,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80551,10 +77595,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80564,8 +77604,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80606,22 +77646,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80644,10 +77684,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80657,8 +77693,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80699,22 +77735,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80737,10 +77773,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80750,8 +77782,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80792,22 +77824,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80830,10 +77862,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80843,8 +77871,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80885,22 +77913,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -80923,10 +77951,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -80936,8 +77960,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -80978,22 +78002,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81016,10 +78040,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81029,8 +78049,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81071,22 +78091,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81109,10 +78129,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81122,8 +78138,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81164,22 +78180,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81202,10 +78218,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81215,8 +78227,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81257,22 +78269,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81295,10 +78307,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81308,8 +78316,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81350,22 +78358,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81388,10 +78396,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81401,8 +78405,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81443,22 +78447,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81481,10 +78485,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81494,8 +78494,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81536,22 +78536,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81574,10 +78574,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81587,8 +78583,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81629,22 +78625,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81667,10 +78663,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81680,8 +78672,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81722,22 +78714,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81760,10 +78752,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81773,8 +78761,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81815,22 +78803,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81853,10 +78841,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81866,8 +78850,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -81908,22 +78892,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -81946,10 +78930,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -81959,8 +78939,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82001,22 +78981,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82039,10 +79019,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82052,8 +79028,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82094,22 +79070,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82132,10 +79108,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82145,8 +79117,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82187,22 +79159,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82225,10 +79197,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82238,8 +79206,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82280,22 +79248,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82318,10 +79286,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82331,8 +79295,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82373,22 +79337,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82411,10 +79375,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82424,8 +79384,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82466,22 +79426,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82504,10 +79464,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82517,8 +79473,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82559,22 +79515,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82597,10 +79553,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82610,8 +79562,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82652,22 +79604,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82690,10 +79642,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82703,8 +79651,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82745,22 +79693,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82783,10 +79731,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82796,8 +79740,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82838,22 +79782,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82876,10 +79820,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82889,8 +79829,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -82931,22 +79871,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -82969,10 +79909,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -82982,8 +79918,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83024,22 +79960,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83062,10 +79998,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83075,8 +80007,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83117,22 +80049,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83155,10 +80087,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83168,8 +80096,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83210,22 +80138,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83248,10 +80176,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83261,8 +80185,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83303,22 +80227,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83341,10 +80265,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83354,8 +80274,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83396,22 +80316,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83434,10 +80354,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83447,8 +80363,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83489,22 +80405,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83527,10 +80443,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83540,8 +80452,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83582,22 +80494,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83620,10 +80532,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83633,8 +80541,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83675,22 +80583,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83713,10 +80621,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83726,8 +80630,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83768,22 +80672,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83806,10 +80710,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83819,8 +80719,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83861,22 +80761,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83899,10 +80799,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -83912,8 +80808,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -83954,22 +80850,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -83992,10 +80888,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84005,8 +80897,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84047,22 +80939,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84085,10 +80977,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84098,8 +80986,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84140,22 +81028,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84178,10 +81066,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84191,8 +81075,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84233,22 +81117,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84271,10 +81155,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84284,8 +81164,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84326,22 +81206,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84364,10 +81244,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84377,8 +81253,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84419,22 +81295,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84457,10 +81333,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84470,8 +81342,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84512,22 +81384,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84550,10 +81422,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84563,8 +81431,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84605,22 +81473,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84643,10 +81511,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84656,8 +81520,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84698,22 +81562,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84736,10 +81600,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84749,8 +81609,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84791,22 +81651,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84829,10 +81689,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84842,8 +81698,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84884,22 +81740,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -84922,10 +81778,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -84935,8 +81787,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -84977,22 +81829,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85015,10 +81867,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85028,8 +81876,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85070,22 +81918,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85108,10 +81956,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85121,8 +81965,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85163,22 +82007,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85201,10 +82045,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85214,8 +82054,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85256,22 +82096,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85294,10 +82134,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85307,8 +82143,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85349,22 +82185,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85387,10 +82223,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85400,8 +82232,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85442,22 +82274,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85480,10 +82312,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85493,8 +82321,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85535,22 +82363,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85573,10 +82401,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85586,8 +82410,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85628,22 +82452,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85666,10 +82490,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85679,8 +82499,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85721,22 +82541,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85759,10 +82579,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85772,8 +82588,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85814,22 +82630,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85852,10 +82668,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85865,8 +82677,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -85907,22 +82719,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -85945,10 +82757,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -85958,8 +82766,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -86000,22 +82808,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -86038,10 +82846,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -86051,8 +82855,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -86093,22 +82897,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -86131,10 +82935,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -86144,8 +82944,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -86186,22 +82986,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -86224,10 +83024,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -86237,8 +83033,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -86279,22 +83075,22 @@ { "name": "infra/tools/luci-auth/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/kitchen/${platform}", "path": ".", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython-native/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" }, { "name": "infra/tools/luci/vpython/${platform}", "path": "cipd_bin_packages", - "version": "git_revision:d95313bf828c9413080bd7ce871e2baa8b568abc" + "version": "git_revision:ffdf7292971ce7c340db6081b30da86618768de1" } ], "command": [ @@ -86317,10 +83113,6 @@ "os:Debian-10.3", "pool:Skia" ], - "environment": { - "RECIPES_USE_PY3": "true", - "VPYTHON_LOG_TRACE": "1" - }, "env_prefixes": { "PATH": [ "cipd_bin_packages/cpython", @@ -86330,8 +83122,8 @@ "cipd_bin_packages", "cipd_bin_packages/bin" ], - "VPYTHON_DEFAULT_SPEC": [ - "skia/.vpython" + "VPYTHON_LOG_TRACE": [ + "1" ], "VPYTHON_VIRTUALENV_ROOT": [ "cache/vpython" @@ -86350,7 +83142,6 @@ "canvaskit": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/canvaskit", "skia/modules/canvaskit", @@ -86367,7 +83158,6 @@ "skia/.clang-format", "skia/.clang-tidy", "skia/.gn", - "skia/.vpython", "skia/BUILD.gn", "skia/bench", "skia/bin/fetch-clang-format", @@ -86417,7 +83207,6 @@ "lottie-ci": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/lottiecap", "skia/tools/lottie-web-perf", @@ -86430,7 +83219,6 @@ "lottie-web": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/tools/lottie-web-perf" ], @@ -86441,7 +83229,6 @@ "pathkit": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/infra/pathkit", "skia/modules/pathkit" @@ -86453,7 +83240,6 @@ "perf": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/platform_tools/ios/bin", @@ -86467,7 +83253,6 @@ "puppeteer": { "root": "../skia", "paths": [ - ".vpython", "tools/perf-canvaskit-puppeteer" ], "excludes": [ @@ -86491,7 +83276,6 @@ "recreate-skps": { "root": "..", "paths": [ - "skia/.vpython", "skia/DEPS", "skia/bin/fetch-sk", "skia/infra/bots/assets/skp", @@ -86506,7 +83290,6 @@ "run-recipe": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py" ], "excludes": [ @@ -86516,7 +83299,6 @@ "skottie-wasm": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/run_recipe.py", "skia/tools/skottie-wasm-perf" ], @@ -86527,7 +83309,6 @@ "skpbench": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/tools/skpbench", @@ -86540,7 +83321,6 @@ "task-drivers": { "root": "..", "paths": [ - "skia/.vpython", "skia/go.mod", "skia/go.sum", "skia/infra/bots/build_task_drivers.sh", @@ -86554,7 +83334,6 @@ "test": { "root": "..", "paths": [ - "skia/.vpython", "skia/infra/bots/assets", "skia/infra/bots/run_recipe.py", "skia/platform_tools/ios/bin", @@ -86568,7 +83347,6 @@ "wasm-gm": { "root": "../skia", "paths": [ - ".vpython", "resources", "tools/run-wasm-gm-tests" ], diff --git a/infra/bots/utils.py b/infra/bots/utils.py index 52d1bdde15..e305bb9f84 100755 --- a/infra/bots/utils.py +++ b/infra/bots/utils.py @@ -22,7 +22,7 @@ SKIA_REPO = 'https://skia.googlesource.com/skia.git' GCLIENT = 'gclient.bat' if sys.platform == 'win32' else 'gclient' WHICH = 'where' if sys.platform == 'win32' else 'which' -GIT = subprocess.check_output([WHICH, 'git']).decode('utf-8').splitlines()[0] +GIT = subprocess.check_output([WHICH, 'git']).splitlines()[0] class print_timings(object): def __init__(self): @@ -90,15 +90,15 @@ class git_branch(object): self._stashed = False def __enter__(self): - output = subprocess.check_output([GIT, 'stash']).decode('utf-8') + output = subprocess.check_output([GIT, 'stash']) self._stashed = 'No local changes' not in output # Get the original branch name or commit hash. self._orig_branch = subprocess.check_output([ - GIT, 'rev-parse', '--abbrev-ref', 'HEAD']).decode('utf-8').rstrip() + GIT, 'rev-parse', '--abbrev-ref', 'HEAD']).rstrip() if self._orig_branch == 'HEAD': self._orig_branch = subprocess.check_output([ - GIT, 'rev-parse', 'HEAD']).decode('utf-8').rstrip() + GIT, 'rev-parse', 'HEAD']).rstrip() # Check out a new branch, based at updated origin/main. subprocess.check_call([GIT, 'fetch', 'origin'])