diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-16 13:10:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-16 17:41:28 +0000 |
| commit | 3e2ffd74b57a917a4df8d64785a18cf79ff2aacd (patch) | |
| tree | 5d504bbf1beb1610b0389cfafb6174e0de564754 /infra/bots | |
| parent | 6ecc911070add386dc9ffeb8b131d21035672fb6 (diff) | |
[recipes] Switch to file module from recipe_engine
Bug: skia:6704
Change-Id: Id3cefa643316e5676d2038a75240e16d929d6d63
Reviewed-on: https://skia-review.googlesource.com/20146
Commit-Queue: Eric Boren <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'infra/bots')
197 files changed, 3793 insertions, 2985 deletions
diff --git a/infra/bots/recipe_modules/core/__init__.py b/infra/bots/recipe_modules/core/__init__.py index 1413f2e4dd..c7a2dca684 100644 --- a/infra/bots/recipe_modules/core/__init__.py +++ b/infra/bots/recipe_modules/core/__init__.py @@ -6,12 +6,13 @@ DEPS = [ 'depot_tools/bot_update', 'depot_tools/gclient', 'depot_tools/tryserver', - 'file', 'flavor', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', + 'recipe_engine/shutil', 'recipe_engine/step', 'run', 'vars', diff --git a/infra/bots/recipe_modules/core/api.py b/infra/bots/recipe_modules/core/api.py index f3486fd11b..5d875f8a19 100644 --- a/infra/bots/recipe_modules/core/api.py +++ b/infra/bots/recipe_modules/core/api.py @@ -26,7 +26,7 @@ class SkiaApi(recipe_api.RecipeApi): self.checkout_steps() if not self.m.path.exists(self.m.vars.tmp_dir): - self.m.run.run_once(self.m.file.makedirs, + self.m.run.run_once(self.m.shutil.makedirs, 'tmp_dir', self.m.vars.tmp_dir, infra_step=True) @@ -46,9 +46,9 @@ class SkiaApi(recipe_api.RecipeApi): # Create the checkout path if necessary. if not self.m.path.exists(self.m.vars.checkout_root): - self.m.file.makedirs('checkout_path', - self.m.vars.checkout_root, - infra_step=True) + self.m.shutil.makedirs('checkout_path', + self.m.vars.checkout_root, + infra_step=True) # Initial cleanup. gclient_cfg = self.m.gclient.make_config(**cfg_kwargs) @@ -114,8 +114,7 @@ class SkiaApi(recipe_api.RecipeApi): entries_file = self.m.vars.checkout_root.join('.gclient_entries') if self.m.path.exists(entries_file) or self._test_data.enabled: self.m.file.remove('remove %s' % entries_file, - entries_file, - infra_step=True) + entries_file) if self.m.vars.need_chromium_checkout: chromium = gclient_cfg.solutions.add() diff --git a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json index 8a174ce609..c24d3ceae1 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json index 4e4f15aa34..fef189fe0b 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/cross_repo_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json index b76b41260f..cc6cb6dec6 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/flutter_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json index f3ec687f83..fb99214d5f 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/pdfium_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/core/examples/full.expected/test.json b/infra/bots/recipe_modules/core/examples/full.expected/test.json index d65d2cff18..efa87523d4 100644 --- a/infra/bots/recipe_modules/core/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/core/examples/full.expected/test.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipe_modules/ct/__init__.py b/infra/bots/recipe_modules/ct/__init__.py index 792ca353ed..7bb21fc483 100644 --- a/infra/bots/recipe_modules/ct/__init__.py +++ b/infra/bots/recipe_modules/ct/__init__.py @@ -4,8 +4,8 @@ DEPS = [ 'depot_tools/gsutil', - 'file', 'recipe_engine/path', + 'recipe_engine/shutil', 'recipe_engine/step', 'run', ] diff --git a/infra/bots/recipe_modules/ct/api.py b/infra/bots/recipe_modules/ct/api.py index 314903fe51..ed302a2283 100644 --- a/infra/bots/recipe_modules/ct/api.py +++ b/infra/bots/recipe_modules/ct/api.py @@ -37,7 +37,9 @@ class CTApi(recipe_api.RecipeApi): # Delete and recreate the local dir. self.m.run.rmtree(slave_dest_dir) - self.m.file.makedirs(self.m.path.basename(slave_dest_dir), slave_dest_dir) + self.m.shutil.makedirs(self.m.path.basename(slave_dest_dir), + slave_dest_dir, + infra_step=True) # Populate the empty local dir. gsutil_args = ['-m', 'cp'] diff --git a/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json b/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json index dc6f888199..c6f14dd68d 100644 --- a/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json +++ b/infra/bots/recipe_modules/ct/examples/full.expected/failed_gsutil.json @@ -3,13 +3,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/skps/slave0" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave0" }, @@ -21,6 +20,7 @@ "[START_DIR]/skps/slave0", "511" ], + "infra_step": true, "name": "makedirs slave0", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipe_modules/ct/examples/full.expected/test.json b/infra/bots/recipe_modules/ct/examples/full.expected/test.json index fa9e44a468..4569906aca 100644 --- a/infra/bots/recipe_modules/ct/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/ct/examples/full.expected/test.json @@ -3,13 +3,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/skps/slave0" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave0" }, @@ -21,6 +20,7 @@ "[START_DIR]/skps/slave0", "511" ], + "infra_step": true, "name": "makedirs slave0", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipe_modules/file/OWNERS b/infra/bots/recipe_modules/file/OWNERS deleted file mode 100644 index 36f4549a0c..0000000000 --- a/infra/bots/recipe_modules/file/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -dnj@chromium.org -iannucci@chromium.org -martiniss@chromium.org -nodir@chromium.org -phajdan.jr@chromium.org diff --git a/infra/bots/recipe_modules/file/__init__.py b/infra/bots/recipe_modules/file/__init__.py deleted file mode 100644 index 29b55cb21c..0000000000 --- a/infra/bots/recipe_modules/file/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -# TODO(borenet): This module belongs in the recipe engine. Remove it from this -# repo once it has been moved. - - -DEPS = [ - 'recipe_engine/json', - 'recipe_engine/path', - 'recipe_engine/python', - 'recipe_engine/raw_io', - 'recipe_engine/step', -] diff --git a/infra/bots/recipe_modules/file/api.py b/infra/bots/recipe_modules/file/api.py deleted file mode 100644 index e2ec61cee6..0000000000 --- a/infra/bots/recipe_modules/file/api.py +++ /dev/null @@ -1,204 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -# TODO(borenet): This module belongs in the recipe engine. Remove it from this -# repo once it has been moved. - - -from recipe_engine import recipe_api - - -class FileApi(recipe_api.RecipeApi): - """FileApi contains helper functions for reading and writing files.""" - - def __init__(self, **kwargs): - super(FileApi, self).__init__(**kwargs) - - def _run_fileutil(self, name, fileutil_args, **kwargs): - # Failure to perform filesystem operations is considered an infrastructure - # failure. - kwargs = kwargs.copy() - kwargs.setdefault('infra_step', True) - - self.m.python( - name, - self.resource('fileutil.py'), - args=fileutil_args, - **kwargs) - - def copy(self, name, source, dest, step_test_data=None, **kwargs): - """Copy a file.""" - return self.m.python.inline( - name, - """ - import shutil - import sys - shutil.copy(sys.argv[1], sys.argv[2]) - """, - args=[source, dest], - add_python_log=False, - step_test_data=step_test_data, - **kwargs - ) - - def copytree(self, name, source, dest, symlinks=False, **kwargs): - """Run shutil.copytree in a step.""" - return self.m.python.inline( - name, - """ - import shutil - import sys - shutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3])) - """, - args=[source, dest, int(symlinks)], - add_python_log=False, - **kwargs - ) - - def move(self, name, source, dest, **kwargs): - """Run shutil.move in a step.""" - return self.m.python.inline( - name, - """ - import shutil - import sys - shutil.move(sys.argv[1], sys.argv[2]) - """, - args=[source, dest], - add_python_log=False, - **kwargs - ) - - def read(self, name, path, test_data=None, **kwargs): - """Read a file and return its contents.""" - step_test_data = None - if test_data is not None: - step_test_data = lambda: self.m.raw_io.test_api.output_text(test_data) - return self.copy(name, path, self.m.raw_io.output_text(), - step_test_data=step_test_data, **kwargs).raw_io.output_text - - def write(self, name, path, data, **kwargs): - """Write the given data to a file.""" - return self.m.python.inline( - name, - """ - import shutil - import sys - shutil.copy(sys.argv[1], sys.argv[2]) - """, - args=[self.m.raw_io.input_text(data), path], - add_python_log=False, - **kwargs - ) - - def glob(self, name, pattern, test_data=None, **kwargs): - """Performs glob search on a directory. - - Returns list of Path objects for all files found. - """ - step_test_data = None - if test_data is not None: - step_test_data = ( - lambda: self.m.raw_io.test_api.output_text( - '\n'.join(map(str, test_data)))) - step_result = self.m.python.inline( - name, - r""" - import glob - import sys - with open(sys.argv[1], 'w') as f: - f.write('\n'.join(glob.glob(sys.argv[2]))) - """, - args=[self.m.raw_io.output_text(), pattern], - step_test_data=step_test_data, - add_python_log=False, - **kwargs - ) - return map(self.m.path.abs_to_path, - step_result.raw_io.output_text.splitlines()) - - def remove(self, name, path, **kwargs): - """Remove the given file.""" - return self.m.python.inline( - name, - """ - import os - import sys - os.remove(sys.argv[1]) - """, - args=[path], - **kwargs - ) - - def listdir(self, name, path, step_test_data=None, **kwargs): - """Wrapper for os.listdir.""" - return self.m.python.inline('listdir %s' % name, - """ - import json, os, sys - if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]): - with open(sys.argv[2], 'w') as f: - json.dump(os.listdir(sys.argv[1]), f) - """, - args=[path, self.m.json.output()], - step_test_data=(step_test_data or ( - lambda: self.m.json.test_api.output(['file 1', 'file 2']))), - **kwargs - ).json.output - - def makedirs(self, name, path, mode=0777, **kwargs): - """ - Like os.makedirs, except that if the directory exists, then there is no - error. - """ - self.m.path.assert_absolute(path) - self.m.python.inline( - 'makedirs ' + name, - """ - import sys, os - path = sys.argv[1] - mode = int(sys.argv[2]) - if not os.path.isdir(path): - if os.path.exists(path): - print "%s exists but is not a dir" % path - sys.exit(1) - os.makedirs(path, mode) - """, - args=[path, str(mode)], - **kwargs - ) - self.m.path.mock_add_paths(path) - - def rmtree(self, name, path, **kwargs): - """Wrapper for chromium_utils.RemoveDirectory.""" - self.m.path.assert_absolute(path) - self._run_fileutil( - 'rmtree ' + name, - ['rmtree', path], - **kwargs) - - def rmcontents(self, name, path, **kwargs): - """ - Similar to rmtree, but removes only contents not the directory. - - This is useful e.g. when removing contents of current working directory. - Deleting current working directory makes all further getcwd calls fail - until chdir is called. chdir would be tricky in recipes, so we provide - a call that doesn't delete the directory itself. - """ - self.m.path.assert_absolute(path) - self._run_fileutil( - 'rmcontents ' + name, - ['rmcontents', path], - **kwargs) - - def rmwildcard(self, pattern, path, **kwargs): - """ - Removes all files in the subtree of path matching the glob pattern. - """ - self.m.path.assert_absolute(path) - self._run_fileutil( - 'rmwildcard %s in %s' % (pattern, path), - ['rmwildcard', path, pattern], - **kwargs) diff --git a/infra/bots/recipe_modules/file/examples/full.expected/file_io.json b/infra/bots/recipe_modules/file/examples/full.expected/file_io.json deleted file mode 100644 index a4e557f9c6..0000000000 --- a/infra/bots/recipe_modules/file/examples/full.expected/file_io.json +++ /dev/null @@ -1,301 +0,0 @@ -[ - { - "cmd": [ - "python", - "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "/fake/dir", - "/path/to/tmp/json" - ], - "name": "listdir fake dir", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "some", - "command" - ], - "name": "manipulate file 1" - }, - { - "cmd": [ - "some", - "command" - ], - "name": "manipulate file 2" - }, - { - "cmd": [ - "python", - "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "/faker/dir", - "/path/to/tmp/json" - ], - "name": "listdir other", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"aaa\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "some", - "command" - ], - "name": "manipulate aaa" - }, - { - "cmd": [ - "echo", - "[TMP_BASE]/prefix_a_tmp_1" - ], - "name": "print prefix_a" - }, - { - "cmd": [ - "echo", - "[TMP_BASE]/prefix_b_tmp_2" - ], - "name": "print prefix_b" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.move(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/source", - "[START_DIR]/destination" - ], - "name": "move" - }, - { - "cmd": [ - "python", - "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", - "[START_DIR]/some_file" - ], - "name": "remove", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", - "rmcontents", - "[START_DIR]/some_dir" - ], - "infra_step": true, - "name": "rmcontents rmcontents" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", - "rmwildcard", - "[START_DIR]", - "*.o" - ], - "infra_step": true, - "name": "rmwildcard *.o in [START_DIR]" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "abcde", - "tmp_file.txt" - ], - "name": "write_simple" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "tmp_file.txt", - "/path/to/tmp/" - ], - "name": "read_simple" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "! ~&&", - "tmp_file.txt" - ], - "name": "write_symbols" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "tmp_file.txt", - "/path/to/tmp/" - ], - "name": "read_symbols" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "abcde fgh", - "tmp_file.txt" - ], - "name": "write_spaces" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "tmp_file.txt", - "/path/to/tmp/" - ], - "name": "read_spaces" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "ab\ncd\nefg\n", - "tmp_file.txt" - ], - "name": "write_multiline" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "tmp_file.txt", - "/path/to/tmp/" - ], - "name": "read_multiline" - }, - { - "cmd": [ - "python", - "-u", - "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n", - "[START_DIR]/copytree_example_tmp", - "511" - ], - "name": "makedirs makedirs", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import sys, os@@@", - "@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@", - "@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@", - "@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@", - "@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@", - "@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@", - "@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "some file content", - "[START_DIR]/copytree_example_tmp/dummy_file" - ], - "name": "write [START_DIR]/copytree_example_tmp/dummy_file" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", - "[START_DIR]/copytree_example_tmp", - "[START_DIR]/copytree_example_tmp2", - "0" - ], - "name": "copytree" - }, - { - "cmd": [ - "python", - "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", - "[START_DIR]/copytree_example_tmp2/dummy_file", - "/path/to/tmp/" - ], - "name": "read [START_DIR]/copytree_example_tmp2/dummy_file" - }, - { - "cmd": [ - "python", - "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/copytree_example_tmp/*" - ], - "name": "glob" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", - "rmtree", - "[START_DIR]/copytree_example_tmp" - ], - "infra_step": true, - "name": "rmtree cleanup" - }, - { - "cmd": [ - "python", - "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", - "rmtree", - "[START_DIR]/copytree_example_tmp2" - ], - "infra_step": true, - "name": "rmtree cleanup2" - }, - { - "name": "$result", - "recipe_result": null, - "status_code": 0 - } -]
\ No newline at end of file diff --git a/infra/bots/recipe_modules/file/examples/full.py b/infra/bots/recipe_modules/file/examples/full.py deleted file mode 100644 index b6f00eabfb..0000000000 --- a/infra/bots/recipe_modules/file/examples/full.py +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -# TODO(borenet): This module belongs in the recipe engine. Remove it from this -# repo once it has been moved. - - -from recipe_engine.types import freeze - -DEPS = [ - 'depot_tools/infra_paths', - 'file', - 'recipe_engine/path', - 'recipe_engine/raw_io', - 'recipe_engine/step', -] - - -TEST_CONTENTS = freeze({ - 'simple': 'abcde', - 'spaces': 'abcde fgh', - 'symbols': '! ~&&', - 'multiline': '''ab -cd -efg -''', -}) - - -def RunSteps(api): - # listdir demo. - result = api.file.listdir('fake dir', '/fake/dir') - for element in result: - api.step('manipulate %s' % str(element), ['some', 'command']) - - result = api.file.listdir('other', '/faker/dir') - for element in result: - api.step('manipulate %s' % str(element), ['some', 'command']) - - # mkdtemp demo. - for prefix in ('prefix_a', 'prefix_b'): - # Create temp dir. - temp_dir = api.path.mkdtemp(prefix) - assert api.path.exists(temp_dir) - # Make |temp_dir| surface in expectation files. - api.step('print %s' % prefix, ['echo', temp_dir]) - - # move demo - api.file.move( - 'move', - api.path['start_dir'].join('source'), - api.path['start_dir'].join('destination')) - - # remove demo - api.file.remove('remove', api.path['start_dir'].join('some_file')) - - # rmcontents demo - api.file.rmcontents('rmcontents', api.path['start_dir'].join('some_dir')) - - # rmwildcard demo - api.file.rmwildcard('*.o', api.path['start_dir']) - - for name, content in TEST_CONTENTS.iteritems(): - api.file.write('write_%s' % name, 'tmp_file.txt', content) - actual_content = api.file.read( - 'read_%s' % name, 'tmp_file.txt', - test_data=content - ) - msg = 'expected %s but got %s' % (content, actual_content) - assert actual_content == content, msg - - try: - # copytree - content = 'some file content' - tmp_dir = api.path['start_dir'].join('copytree_example_tmp') - api.file.makedirs('makedirs', tmp_dir) - path = tmp_dir.join('dummy_file') - api.file.write('write %s' % path, path, content) - new_tmp = api.path['start_dir'].join('copytree_example_tmp2') - new_path = new_tmp.join('dummy_file') - api.file.copytree('copytree', tmp_dir, new_tmp) - actual_content = api.file.read('read %s' % new_path, new_path, - test_data=content) - assert actual_content == content - - # glob. - files = api.file.glob( - 'glob', tmp_dir.join('*'), - test_data=[tmp_dir.join('dummy_file')]) - assert files == [tmp_dir.join('dummy_file')], files - - finally: - api.file.rmtree('cleanup', tmp_dir) - api.file.rmtree('cleanup2', new_tmp) - - -def GenTests(api): - yield api.test('file_io') + api.file.listdir('other', ['aaa']) - diff --git a/infra/bots/recipe_modules/file/resources/fileutil.py b/infra/bots/recipe_modules/file/resources/fileutil.py deleted file mode 100755 index ec73a9b3eb..0000000000 --- a/infra/bots/recipe_modules/file/resources/fileutil.py +++ /dev/null @@ -1,174 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -# TODO(borenet): This module belongs in the recipe engine. Remove it from this -# repo once it has been moved. - - -"""Utility exporting basic filesystem operations. - -This file was cut from "scripts/common/chromium_utils.py" at: -91310531c31fa645256b4fb5d44b460c42b3e151 -""" - -import argparse -import errno -import fnmatch -import os -import shutil -import subprocess -import sys -import time - - -def _LocateFiles(pattern, root): - """Yeilds files matching pattern found in root and its subdirectories. - - An exception is thrown if root doesn't exist.""" - for path, _, files in os.walk(os.path.abspath(root)): - for filename in fnmatch.filter(files, pattern): - yield os.path.join(path, filename) - - -def _RemoveFilesWildcards(file_wildcard, root): - """Removes files matching 'file_wildcard' in root and its subdirectories, if - any exists. - - An exception is thrown if root doesn't exist.""" - for item in _LocateFiles(file_wildcard, root): - try: - os.remove(item) - except OSError, e: - if e.errno != errno.ENOENT: - raise - - -def _RemoveContents(path): - if os.path.exists(path): - for p in (os.path.join(path, x) for x in os.listdir(path)): - if os.path.isdir(p): - _RemoveDirectory(p) - else: - os.unlink(p) - - -def _RemoveDirectory(*path): - """Recursively removes a directory, even if it's marked read-only. - - Remove the directory located at *path, if it exists. - - shutil.rmtree() doesn't work on Windows if any of the files or directories - are read-only, which svn repositories and some .svn files are. We need to - be able to force the files to be writable (i.e., deletable) as we traverse - the tree. - - Even with all this, Windows still sometimes fails to delete a file, citing - a permission error (maybe something to do with antivirus scans or disk - indexing). The best suggestion any of the user forums had was to wait a - bit and try again, so we do that too. It's hand-waving, but sometimes it - works. :/ - """ - file_path = os.path.join(*path) - if not os.path.exists(file_path): - return - - if sys.platform == 'win32': - # Give up and use cmd.exe's rd command. - file_path = os.path.normcase(file_path) - for _ in xrange(3): - print 'RemoveDirectory running %s' % (' '.join( - ['cmd.exe', '/c', 'rd', '/q', '/s', file_path])) - if not subprocess.call(['cmd.exe', '/c', 'rd', '/q', '/s', file_path]): - break - print ' Failed' - time.sleep(3) - return - - def RemoveWithRetry_non_win(rmfunc, path): - if os.path.islink(path): - return os.remove(path) - else: - return rmfunc(path) - - remove_with_retry = RemoveWithRetry_non_win - - def RmTreeOnError(function, path, excinfo): - r"""This works around a problem whereby python 2.x on Windows has no ability - to check for symbolic links. os.path.islink always returns False. But - shutil.rmtree will fail if invoked on a symbolic link whose target was - deleted before the link. E.g., reproduce like this: - > mkdir test - > mkdir test\1 - > mklink /D test\current test\1 - > python -c "import chromium_utils; chromium_utils.RemoveDirectory('test')" - To avoid this issue, we pass this error-handling function to rmtree. If - we see the exact sort of failure, we ignore it. All other failures we re- - raise. - """ - - exception_type = excinfo[0] - exception_value = excinfo[1] - # If shutil.rmtree encounters a symbolic link on Windows, os.listdir will - # fail with a WindowsError exception with an ENOENT errno (i.e., file not - # found). We'll ignore that error. Note that WindowsError is not defined - # for non-Windows platforms, so we use OSError (of which it is a subclass) - # to avoid lint complaints about an undefined global on non-Windows - # platforms. - if (function is os.listdir) and issubclass(exception_type, OSError): - if exception_value.errno == errno.ENOENT: - # File does not exist, and we're trying to delete, so we can ignore the - # failure. - print 'WARNING: Failed to list %s during rmtree. Ignoring.\n' % path - else: - raise - else: - raise - - for root, dirs, files in os.walk(file_path, topdown=False): - # For POSIX: making the directory writable guarantees removability. - # Windows will ignore the non-read-only bits in the chmod value. - os.chmod(root, 0770) - for name in files: - remove_with_retry(os.remove, os.path.join(root, name)) - for name in dirs: - remove_with_retry(lambda p: shutil.rmtree(p, onerror=RmTreeOnError), - os.path.join(root, name)) - - remove_with_retry(os.rmdir, file_path) - - -def main(args): - parser = argparse.ArgumentParser() - - subparsers = parser.add_subparsers() - - # Subcommand: rmtree - subparser = subparsers.add_parser('rmtree', - help='Recursively remove a directory.') - subparser.add_argument('path', nargs='+', help='A path to remove.') - subparser.set_defaults(func=lambda opts: _RemoveDirectory(*opts.path)) - - # Subcommand: rmcontents - subparser = subparsers.add_parser('rmcontents', - help='Recursively remove the contents of a directory.') - subparser.add_argument('path', help='The target directory.') - subparser.set_defaults(func=lambda opts: _RemoveContents(opts.path)) - - # Subcommand: rmwildcard - subparser = subparsers.add_parser('rmwildcard', - help='Recursively remove the contents of a directory.') - subparser.add_argument('root', help='The directory to search through.') - subparser.add_argument('wildcard', help='The wildcard expression to remove.') - subparser.set_defaults(func=lambda opts: - _RemoveFilesWildcards(opts.wildcard, opts.root)) - - # Parse arguments. - opts = parser.parse_args(args) - opts.func(opts) - - -if __name__ == '__main__': - main(sys.argv[1:]) diff --git a/infra/bots/recipe_modules/file/test_api.py b/infra/bots/recipe_modules/file/test_api.py deleted file mode 100644 index 8d13cbac1a..0000000000 --- a/infra/bots/recipe_modules/file/test_api.py +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - - -# TODO(borenet): This module belongs in the recipe engine. Remove it from this -# repo once it has been moved. - - -from recipe_engine import recipe_test_api - - -class FileTestApi(recipe_test_api.RecipeTestApi): - def listdir(self, dirname, files): - return self.step_data( - 'listdir %s' % dirname, - self.m.json.output(files)) - diff --git a/infra/bots/recipe_modules/flavor/__init__.py b/infra/bots/recipe_modules/flavor/__init__.py index ac84d20cf3..87f33d9a35 100644 --- a/infra/bots/recipe_modules/flavor/__init__.py +++ b/infra/bots/recipe_modules/flavor/__init__.py @@ -6,13 +6,14 @@ DEPS = [ 'builder_name_schema', 'depot_tools/bot_update', 'env', - 'file', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', 'run', 'vars', diff --git a/infra/bots/recipe_modules/flavor/default_flavor.py b/infra/bots/recipe_modules/flavor/default_flavor.py index 22a4487b93..cf75e9fac8 100644 --- a/infra/bots/recipe_modules/flavor/default_flavor.py +++ b/infra/bots/recipe_modules/flavor/default_flavor.py @@ -140,7 +140,7 @@ class DefaultFlavorUtils(object): def create_clean_host_dir(self, path): """Convenience function for creating a clean directory.""" self.m.run.rmtree(path) - self.m.file.makedirs( + self.m.shutil.makedirs( self.m.path.basename(path), path, infra_step=True) def install(self): diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index aab696625e..497b10824f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -17,14 +17,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree android_release" }, diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json index 51358ad2b6..07fa18707f 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Debug-Android.json @@ -67,13 +67,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -193,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -204,7 +206,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -339,7 +344,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -350,7 +358,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -485,7 +496,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -496,7 +510,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -648,7 +665,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --some-flag; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release.json index 07d05b21e2..5e9b7567fa 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Release.json @@ -99,13 +99,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -285,7 +284,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -296,7 +298,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -431,7 +436,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -442,7 +450,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -577,7 +588,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -588,7 +602,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release.json index 962231fb92..ccd9fa9887 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Release.json @@ -107,13 +107,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -236,7 +235,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -247,7 +249,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -385,7 +390,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -396,7 +404,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -534,7 +545,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -545,7 +559,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json index 590adde220..1f05d9a151 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-ASAN.json @@ -50,13 +50,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -87,13 +86,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "device_results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree device_results_dir" }, @@ -124,7 +122,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -135,7 +136,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -146,7 +150,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -157,7 +164,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -168,7 +178,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -179,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-MSAN.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-MSAN.json index b2d09d12db..c28230058c 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-MSAN.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-MSAN.json @@ -50,13 +50,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -87,13 +86,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "device_results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree device_results_dir" }, @@ -124,7 +122,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -135,7 +136,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -146,7 +150,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -157,7 +164,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -168,7 +178,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -179,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release.json index c41083b4a5..28e6852986 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release.json @@ -50,13 +50,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -87,13 +86,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "device_results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree device_results_dir" }, @@ -124,7 +122,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -135,7 +136,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -146,7 +150,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -157,7 +164,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -168,7 +178,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -179,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index 5ec8b5c68f..5e61686885 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -50,13 +50,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -87,13 +86,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "device_results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree device_results_dir" }, @@ -124,7 +122,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -135,7 +136,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -146,7 +150,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -157,7 +164,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -168,7 +178,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -179,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug.json index 9604e7c1dd..ddc87a7b73 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug.json @@ -50,13 +50,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -87,13 +86,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "device_results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree device_results_dir" }, @@ -124,7 +122,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -135,7 +136,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -146,7 +150,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -157,7 +164,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -168,7 +178,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -179,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json index 3614d82d6a..65700895d6 100644 --- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json +++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm64-Debug.json @@ -97,13 +97,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -220,7 +219,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -231,7 +233,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -329,7 +334,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -340,7 +348,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -438,7 +449,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -449,7 +463,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], 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 7b6e6e9495..7326513159 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 @@ -67,13 +67,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -193,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -204,7 +206,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -339,7 +344,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -350,7 +358,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -485,7 +496,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -496,7 +510,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -648,7 +665,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --some-flag; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], 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 4763d12971..fc4dd9dc7b 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 @@ -67,13 +67,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "results_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree results_dir" }, @@ -193,7 +192,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -204,7 +206,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -339,7 +344,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -350,7 +358,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -489,7 +500,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -500,7 +514,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -652,7 +669,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --some-flag; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipe_modules/isolate/__init__.py b/infra/bots/recipe_modules/isolate/__init__.py index 0da966d494..2a686fb379 100644 --- a/infra/bots/recipe_modules/isolate/__init__.py +++ b/infra/bots/recipe_modules/isolate/__init__.py @@ -9,10 +9,10 @@ DEPS = [ - 'file', 'depot_tools/git', 'depot_tools/gsutil', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipe_modules/isolate/api.py b/infra/bots/recipe_modules/isolate/api.py index 09aeb99a93..4b3daa2085 100644 --- a/infra/bots/recipe_modules/isolate/api.py +++ b/infra/bots/recipe_modules/isolate/api.py @@ -116,11 +116,12 @@ class IsolateApi(recipe_api.RecipeApi): # deprecated in favor of to *_ng builders, that pass targets explicitly. if targets is None: # Ninja builds <target>.isolated.gen.json files via isolate_driver.py. - paths = self.m.file.glob( + paths = self.m.file.glob_paths( 'find isolated targets', - build_dir.join('*.isolated.gen.json'), + build_dir, + '*.isolated.gen.json', test_data=[ - build_dir.join('dummy_target_%d.isolated.gen.json' % i) + 'dummy_target_%d.isolated.gen.json' % i for i in (1, 2) ]) targets = [] diff --git a/infra/bots/recipe_modules/isolate/tests/isolate_tests.expected/basic.json b/infra/bots/recipe_modules/isolate/tests/isolate_tests.expected/basic.json index d2fcf462df..0e272ef4ef 100644 --- a/infra/bots/recipe_modules/isolate/tests/isolate_tests.expected/basic.json +++ b/infra/bots/recipe_modules/isolate/tests/isolate_tests.expected/basic.json @@ -3,11 +3,21 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "None/out/Release/*.isolated.gen.json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "None/out/Release", + "*.isolated.gen.json" ], - "name": "find isolated targets" + "infra_step": true, + "name": "find isolated targets", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@None/out/Release/dummy_target_1.isolated.gen.json@@@", + "@@@STEP_LOG_LINE@glob@None/out/Release/dummy_target_2.isolated.gen.json@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipe_modules/run/__init__.py b/infra/bots/recipe_modules/run/__init__.py index 7c13f4f8ee..6458cdb2c3 100644 --- a/infra/bots/recipe_modules/run/__init__.py +++ b/infra/bots/recipe_modules/run/__init__.py @@ -4,7 +4,7 @@ DEPS = [ 'env', - 'file', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', diff --git a/infra/bots/recipe_modules/run/api.py b/infra/bots/recipe_modules/run/api.py index b487a75d9c..3c989802e0 100644 --- a/infra/bots/recipe_modules/run/api.py +++ b/infra/bots/recipe_modules/run/api.py @@ -61,21 +61,16 @@ class SkiaStepApi(recipe_api.RecipeApi): def readfile(self, filename, *args, **kwargs): """Convenience function for reading files.""" name = kwargs.pop('name', 'read %s' % self.m.path.basename(filename)) - return self.m.file.read(name, filename, infra_step=True, *args, **kwargs) + return self.m.file.read_text(name, filename, *args, **kwargs) def writefile(self, filename, contents): """Convenience function for writing files.""" - return self.m.file.write('write %s' % self.m.path.basename(filename), - filename, contents, infra_step=True) + return self.m.file.write_text('write %s' % self.m.path.basename(filename), + filename, contents) def rmtree(self, path): - """Wrapper around api.file.rmtree with environment fix.""" - env = {'PYTHONPATH': str(self.m.path['start_dir'].join( - 'skia', 'infra', 'bots', '.recipe_deps', 'build', 'scripts'))} - with self.m.env(env): - self.m.file.rmtree(self.m.path.basename(path), - path, - infra_step=True) + """Wrapper around api.file.rmtree.""" + self.m.file.rmtree('rmtree %s' % self.m.path.basename(path), path) def __call__(self, steptype, name, abort_on_failure=True, fail_build_on_failure=True, **kwargs): diff --git a/infra/bots/recipe_modules/run/examples/full.expected/test.json b/infra/bots/recipe_modules/run/examples/full.expected/test.json index 4689d7953c..ae580d3a40 100644 --- a/infra/bots/recipe_modules/run/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/run/examples/full.expected/test.json @@ -61,7 +61,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "myfile.txt", "/path/to/tmp/" ], @@ -72,7 +75,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "contents", "myfile.txt" ], @@ -83,13 +89,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "mydir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree mydir" }, diff --git a/infra/bots/recipe_modules/skia_swarming/__init__.py b/infra/bots/recipe_modules/skia_swarming/__init__.py index 435ad0be88..9ff7a93519 100644 --- a/infra/bots/recipe_modules/skia_swarming/__init__.py +++ b/infra/bots/recipe_modules/skia_swarming/__init__.py @@ -4,14 +4,15 @@ DEPS = [ 'depot_tools/depot_tools', - 'file', 'isolate', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', 'run', 'swarming', diff --git a/infra/bots/recipe_modules/skia_swarming/api.py b/infra/bots/recipe_modules/skia_swarming/api.py index 35dddcf507..07bf145557 100644 --- a/infra/bots/recipe_modules/skia_swarming/api.py +++ b/infra/bots/recipe_modules/skia_swarming/api.py @@ -82,7 +82,10 @@ class SkiaSwarmingApi(recipe_api.RecipeApi): blacklist: list of regular expressions indicating which files/directories not to archive. """ - self.m.file.makedirs('swarming tmp dir', self.swarming_temp_dir) + self.m.shutil.makedirs( + 'swarming tmp dir', + self.swarming_temp_dir, + infra_step=True) isolated_path = self.isolated_file_path(task_name) isolate_args = [ '--isolate', isolate_path, @@ -101,7 +104,7 @@ class SkiaSwarmingApi(recipe_api.RecipeApi): } isolated_gen_json = self.swarming_temp_dir.join( '%s.isolated.gen.json' % task_name) - self.m.file.write( + self.m.file.write_text( 'Write %s.isolated.gen.json' % task_name, isolated_gen_json, self.m.json.dumps(isolated_gen_dict, indent=4), diff --git a/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json b/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json index 1ab18c6eba..2832ee6657 100644 --- a/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json +++ b/infra/bots/recipe_modules/skia_swarming/examples/full.expected/test.json @@ -150,13 +150,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -164,11 +163,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "mydir", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary" }, { @@ -179,6 +181,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -197,10 +200,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"isolate_path\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-task.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"myvar\", \n \"myval\"\n ], \n \"dir\": \"isolate_dir\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/task.isolated.gen.json" ], + "infra_step": true, "name": "Write task.isolated.gen.json" }, { diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json b/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json index 9a55d5c3d8..3ee20d6d7d 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/basic.json @@ -668,12 +668,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json b/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json index 69019a8494..acce4ef888 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/show_isolated_out_in_collect_step.json @@ -282,12 +282,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json b/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json index f4c2e7bb36..23548d8a88 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/show_shards_in_collect_step.json @@ -284,12 +284,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json index 5fa8e68abd..13fceacf6d 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_new.json @@ -266,12 +266,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json index f0e2d64568..0692854820 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_expired_old.json @@ -266,12 +266,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json index 46ca02c42d..3e8d7fe6ad 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_new.json @@ -263,12 +263,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json index a2741eb88f..52d02bd4cf 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/swarming_timeout_old.json @@ -263,12 +263,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json b/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json index 7b23e8cb56..79ecb1cb6a 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json +++ b/infra/bots/recipe_modules/swarming/examples/full.expected/trybot.json @@ -283,12 +283,14 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[TMP_BASE]/hello_isolated_world_tmp_1" ], "infra_step": true, - "name": "rmtree remove temp dir" + "name": "remove temp dir" }, { "name": "$result", diff --git a/infra/bots/recipe_modules/swarming/examples/full.py b/infra/bots/recipe_modules/swarming/examples/full.py index f61576a24d..ea6a1527d3 100644 --- a/infra/bots/recipe_modules/swarming/examples/full.py +++ b/infra/bots/recipe_modules/swarming/examples/full.py @@ -11,8 +11,8 @@ import json DEPS = [ - 'file', 'isolate', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json index abbed85655..9b702e8030 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json index eeef473788..f6a7e2a92f 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-arm64-Debug-iOS.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json index 2e736fa412..f3f48d3fc7 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x64-Release-iOS.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json index 7f8b9ebb94..69b6cbee04 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Debug-CommandBuffer.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json index cf49656160..16438063d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json +++ b/infra/bots/recipes/compile.expected/Build-Mac-Clang-x86_64-Release.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json index f8bc7f5770..c3c7be7087 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm-Release-Chromebook_C100p.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json index a4d162827e..7e7e8bed93 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Debug-Android_FrameworkDefs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json index 5b652e4128..db474747a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json index b70908dc81..7f75f0f356 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-arm64-Release-Android_Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json index 1824f0e32a..24b9c0e1ac 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-mipsel-Debug-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json index 7fef6195f3..89ad1ca0d3 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-ASAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json index 77e580f6b9..1fc33c3cec 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug-MSAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json index f9c9577412..bb5a01002f 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json index f5d9fedf6c..a13069aced 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Mini.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json index 92bd933783..05b6c08d5d 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-Clang-x86_64-Release-Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json index 80498d5fbb..cce2d0fbd1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-arm-Release-Chromecast.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json index b6914a687a..fce934fb30 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json index 36fd128a40..3cbe2deef8 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-GN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json index 555bdba784..e9bb5fe775 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-MSAN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json index 7ae0f3186d..797b381ebd 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-NoGPU.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index ee593df078..054c972ad4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json index bc6e16998a..2faa57bc28 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-ANGLE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json index 0aa8231ff9..5d6890cb23 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Fast.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json index 26e896d79c..68c6d293d9 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Flutter_Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ @@ -123,14 +119,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree android_release" }, diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json index 7c03880657..c76b4c6011 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Mesa.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json index 2c2a7cdeb3..e79a0b4aa1 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json index cc23c9e0f5..89d168a6a4 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-PDFium_SkiaPaths.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json index 9bab8cac6b..d1b7cd9295 100644 --- a/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json +++ b/infra/bots/recipes/compile.expected/Build-Ubuntu-GCC-x86_64-Release-Shared.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json index 33f0969632..37580d75ec 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json +++ b/infra/bots/recipes/compile.expected/Build-Win-Clang-arm64-Release-Android.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json index 24cc9c3c04..cf63dbfd13 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-ANGLE.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json index 1d58948bb8..1726382066 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug-Exceptions.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json index a83e2488a4..a7e7b13776 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Debug.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json index e1a6c3c3ba..fc95d28712 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GDI.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json index 31aaf5c15d..e5f7899be9 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86-Release-GN.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json index 60c9b55348..538448fe91 100644 --- a/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/compile.expected/Build-Win-MSVC-x86_64-Release-Vulkan.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]\\.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]\\.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/alternate_repo.json b/infra/bots/recipes/compile.expected/alternate_repo.json index d2462d49dc..0096a798ae 100644 --- a/infra/bots/recipes/compile.expected/alternate_repo.json +++ b/infra/bots/recipes/compile.expected/alternate_repo.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/flutter_trybot.json b/infra/bots/recipes/compile.expected/flutter_trybot.json index 76510d9498..be4261a6b9 100644 --- a/infra/bots/recipes/compile.expected/flutter_trybot.json +++ b/infra/bots/recipes/compile.expected/flutter_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/flutter/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/flutter/.gclient_entries" }, { "cmd": [ @@ -127,14 +123,13 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/flutter/src/out/android_release" ], "cwd": "[CUSTOM_/_B_WORK]/flutter/src", - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree android_release" }, diff --git a/infra/bots/recipes/compile.expected/pdfium_trybot.json b/infra/bots/recipes/compile.expected/pdfium_trybot.json index f36241f76a..8e749f228c 100644 --- a/infra/bots/recipes/compile.expected/pdfium_trybot.json +++ b/infra/bots/recipes/compile.expected/pdfium_trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/compile.expected/trybot.json b/infra/bots/recipes/compile.expected/trybot.json index 5ec0f97398..ed7d5504c3 100644 --- a/infra/bots/recipes/compile.expected/trybot.json +++ b/infra/bots/recipes/compile.expected/trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_C:\\_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_C:\\_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index a5ee8619d3..22229ae91e 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_10k_SKPs/skps_version" ], @@ -1311,23 +1336,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1457,23 +1478,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1603,23 +1620,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1749,23 +1762,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1895,23 +1904,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json index 10824bba4e..bba0420e8f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_100k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json index 42e8bfb59d..fbec4f3efb 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index 88afa7c550..95a9220789 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -357,13 +353,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -371,11 +366,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -386,13 +384,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -400,13 +397,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -418,6 +414,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -463,6 +460,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -481,23 +479,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -509,6 +510,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -554,6 +556,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -572,23 +575,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -600,6 +606,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -645,6 +652,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -663,23 +671,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -691,6 +702,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -736,6 +748,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -754,23 +767,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -782,6 +798,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -827,6 +844,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -845,17 +863,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_10k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json index 9345f5deba..f95a572187 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 81832c8daf..bc1251aac9 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index 06b41d8f1f..4b4b6d8d60 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/All/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-dm-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"dm\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-dm-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-dm-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"All\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index 2e3aca1d52..9f76dbb2c6 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_10k_SKPs/skps_version" ], @@ -1326,23 +1351,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1472,23 +1493,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1618,23 +1635,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1764,23 +1777,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1910,23 +1919,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { diff --git a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index 2c0de8390d..e8439c57a5 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-nanobench-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Release\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"nanobench\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-nanobench-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-nanobench-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Perf-Ubuntu-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs/skps_version" ], @@ -1326,23 +1351,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0" ], + "infra_step": true, "name": "listdir output dir", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-1/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1472,23 +1493,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0" ], + "infra_step": true, "name": "listdir output dir (2)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-2/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1618,23 +1635,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0" ], + "infra_step": true, "name": "listdir output dir (3)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-3/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1764,23 +1777,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0" ], + "infra_step": true, "name": "listdir output dir (4)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-4/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { @@ -1910,23 +1919,19 @@ "cmd": [ "python", "-u", - "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n", - "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0", - "/path/to/tmp/json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "listdir", + "[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0" ], + "infra_step": true, "name": "listdir output dir (5)", + "stdout": "/path/to/tmp/", "~followup_annotations": [ - "@@@STEP_LOG_LINE@json.output@[@@@", - "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@", - "@@@STEP_LOG_LINE@json.output@]@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@", - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@", - "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@", - "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@", - "@@@STEP_LOG_END@python.inline@@@" + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 1@@@", + "@@@STEP_LOG_LINE@listdir@[START_DIR]/swarming_temp_dir/outputs/ct-nanobench-5/0/file 2@@@", + "@@@STEP_LOG_END@listdir@@@" ] }, { diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index b4016a7c9a..d06d5b20b0 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/100k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"100k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 5de1b1062b..1b01ef850f 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -353,13 +349,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -367,11 +362,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -382,13 +380,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -396,13 +393,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -414,6 +410,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -459,6 +456,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -477,23 +475,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -505,6 +506,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -550,6 +552,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -568,23 +571,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -596,6 +602,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -641,6 +648,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -659,23 +667,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -687,6 +698,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -732,6 +744,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -750,23 +763,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -778,6 +794,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -823,6 +840,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -841,17 +859,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 4edf4f5f24..fcf032a8a1 100644 --- a/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -357,13 +353,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/luci-go" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree luci-go" }, @@ -371,11 +366,14 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copytree(sys.argv[1], sys.argv[2], symlinks=bool(sys.argv[3]))\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copytree", "[CUSTOM_/_B_WORK]/skia/infra/bots/tools/luci-go", - "[START_DIR]/luci-go", - "0" + "[START_DIR]/luci-go" ], + "infra_step": true, "name": "Copy Go binary", "~followup_annotations": [ "@@@SET_BUILD_PROPERTY@Download SKPs by rank@\"https://pantheon.corp.google.com/storage/browser/cluster-telemetry/swarming/skps/10k/c37e844a6f8708-eee762104c75bd/\"@@@", @@ -386,13 +384,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/swarming_temp_dir" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree swarming_temp_dir" }, @@ -400,13 +397,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave1" }, @@ -418,6 +414,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave1", "511" ], + "infra_step": true, "name": "makedirs slave1", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -463,6 +460,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -481,23 +479,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-1.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"1\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-1.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-1.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave2" }, @@ -509,6 +510,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave2", "511" ], + "infra_step": true, "name": "makedirs slave2", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -554,6 +556,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (2)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -572,23 +575,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-2.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"2\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-2.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-2.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave3" }, @@ -600,6 +606,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave3", "511" ], + "infra_step": true, "name": "makedirs slave3", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -645,6 +652,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (3)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -663,23 +671,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-3.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"3\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-3.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-3.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave4" }, @@ -691,6 +702,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave4", "511" ], + "infra_step": true, "name": "makedirs slave4", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -736,6 +748,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (4)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -754,23 +767,26 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-4.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"4\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-4.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-4.isolated.gen.json" }, { "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree slave5" }, @@ -782,6 +798,7 @@ "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/slave5", "511" ], + "infra_step": true, "name": "makedirs slave5", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -827,6 +844,7 @@ "[START_DIR]/swarming_temp_dir", "511" ], + "infra_step": true, "name": "makedirs swarming tmp dir (5)", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", @@ -845,17 +863,24 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\n \"args\": [\n \"--isolate\", \n \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct/ct_skps.isolate\", \n \"--isolated\", \n \"[START_DIR]/swarming_temp_dir/skia-task-ct-get_images_from_skps-5.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\", \n \"--extra-variable\", \n \"CONFIGURATION\", \n \"Debug\", \n \"--extra-variable\", \n \"BUILDER\", \n \"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs\", \n \"--extra-variable\", \n \"GIT_HASH\", \n \"9046e2e693bb92a76e972b694580e5d17ad10748\", \n \"--extra-variable\", \n \"SLAVE_NUM\", \n \"5\", \n \"--extra-variable\", \n \"TOOL_NAME\", \n \"get_images_from_skps\"\n ], \n \"dir\": \"[CUSTOM_/_B_WORK]/skia/infra/bots/ct\", \n \"version\": 1\n}", "[START_DIR]/swarming_temp_dir/ct-get_images_from_skps-5.isolated.gen.json" ], + "infra_step": true, "name": "Write ct-get_images_from_skps-5.isolated.gen.json" }, { "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "{\"chromium_build\": \"c37e844a6f8708-eee762104c75bd\", \"num_slaves\": 5, \"page_type\": \"10k\"}", "[CUSTOM_/_B_WORK]/skps/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_10k_SKPs/skps_version" ], diff --git a/infra/bots/recipes/ct_skps.py b/infra/bots/recipes/ct_skps.py index 048edcc17c..3d9c67f7f0 100644 --- a/infra/bots/recipes/ct_skps.py +++ b/infra/bots/recipes/ct_skps.py @@ -7,17 +7,18 @@ import math DEPS = [ + 'core', + 'ct', 'depot_tools/gsutil', - 'file', + 'flavor', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', + 'recipe_engine/shutil', 'recipe_engine/step', 'recipe_engine/time', - 'core', - 'ct', - 'flavor', 'run', 'skia_swarming', 'vars', @@ -123,11 +124,10 @@ def RunSteps(api): skps_dir = api.vars.checkout_root.join('skps', buildername) version_file = skps_dir.join(SKPS_VERSION_FILE) if api.path.exists(version_file): # pragma: nocover - version_file_contents = api.file.read( + version_file_contents = api.file.read_text( "Read %s" % version_file, version_file, - test_data=expected_version_contents, - infra_step=True) + test_data=expected_version_contents) actual_version_contents = api.json.loads(version_file_contents) differences = (set(expected_version_contents.items()) ^ set(actual_version_contents.items())) @@ -135,7 +135,8 @@ def RunSteps(api): if download_skps: # Delete and recreate the skps dir. api.run.rmtree(skps_dir) - api.file.makedirs(api.path.basename(skps_dir), skps_dir) + api.shutil.makedirs( + api.path.basename(skps_dir), skps_dir, infra_step=True) # If a blacklist file exists then specify SKPs to be blacklisted. blacklists_dir = api.vars.skia_dir.join('infra', 'bots', 'ct', 'blacklists') @@ -143,10 +144,9 @@ def RunSteps(api): '%s_%s_%s.json' % (skia_tool, ct_page_type, skps_chromium_build)) blacklist_skps = [] if api.path.exists(blacklist_file): # pragma: nocover - blacklist_file_contents = api.file.read( + blacklist_file_contents = api.file.read_text( "Read %s" % blacklist_file, - blacklist_file, - infra_step=True) + blacklist_file) blacklist_skps = api.json.loads(blacklist_file_contents)['blacklisted_skps'] for slave_num in range(1, ct_num_slaves + 1): @@ -172,10 +172,9 @@ def RunSteps(api): if download_skps: # Since we had to download SKPs create an updated version file. - api.file.write("Create %s" % version_file, - version_file, - api.json.dumps(expected_version_contents), - infra_step=True) + api.file.write_text("Create %s" % version_file, + version_file, + api.json.dumps(expected_version_contents)) # Batcharchive everything on the isolate server for efficiency. max_slaves_to_batcharchive = MAX_SLAVES_TO_BATCHARCHIVE @@ -213,11 +212,12 @@ def RunSteps(api): utc = api.time.utcnow() gs_dest_dir = 'ct/%s/%d/%02d/%02d/%02d/' % ( ct_page_type, utc.year, utc.month, utc.day, utc.hour) - for json_output in api.file.listdir('output dir', output_dir): + for json_output in api.file.listdir( + 'listdir output dir', output_dir, test_data=['file 1', 'file 2']): with api.context(env=env): api.gsutil.upload( name='upload json output', - source=output_dir.join(json_output), + source=json_output, bucket='skia-perf', dest=gs_dest_dir, args=['-R'] diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json index f5aa44ac0e..c13e2402c4 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json index 8efaa4a288..b7ce10907b 100644 --- a/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json +++ b/infra/bots/recipes/housekeeper.expected/Housekeeper-PerCommit.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/infra.expected/failed_all_updates.json b/infra/bots/recipes/infra.expected/failed_all_updates.json index dc9fcafd1b..9c8de53759 100644 --- a/infra/bots/recipes/infra.expected/failed_all_updates.json +++ b/infra/bots/recipes/infra.expected/failed_all_updates.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/infra.expected/failed_one_update.json b/infra/bots/recipes/infra.expected/failed_one_update.json index 777a62e69c..6aa63c6808 100644 --- a/infra/bots/recipes/infra.expected/failed_one_update.json +++ b/infra/bots/recipes/infra.expected/failed_one_update.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/infra.expected/infra_tests.json b/infra/bots/recipes/infra.expected/infra_tests.json index 4b68ca5072..d722a0aff4 100644 --- a/infra/bots/recipes/infra.expected/infra_tests.json +++ b/infra/bots/recipes/infra.expected/infra_tests.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan.json index 440d200109..439c0d9158 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android_Vulkan.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -539,7 +557,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json index 89605774d8..626505c430 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -575,7 +593,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nogpu --pre_log --scales 1.0 1.1 --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm compiler Clang cpu_or_gpu CPU cpu_or_gpu_value Exynos5250 extra_config Android model Nexus10 os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], @@ -660,6 +681,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json index 4f33dc8f4f..19f680bf8c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -539,7 +557,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android.json index 757d807138..9801df3104 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -575,7 +593,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config Android model Nexus7 os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], @@ -660,6 +681,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-Android/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json index 13c8184d91..efcbef86c0 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -575,7 +593,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui f16 srgb gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config Android model NexusPlayer os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], @@ -660,6 +681,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json index 1c7dcbb77e..64bbff83a9 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -575,7 +593,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config vk --match ~blurroundrect ~patch_grid ~desk_carsvg ~desk_unicodetable ~Xfermode ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch x86 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config Android_Vulkan model NexusPlayer os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], @@ -660,6 +681,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json index 7210fa60c2..bbfc10b4cb 100644 --- a/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json +++ b/infra/bots/recipes/perf.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -575,7 +593,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 nonrendering hwui f16 srgb gles glesmsaa4 glesnvpr4 glesnvprdit4 glesinst glesinst4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 swarming_bot_id skia-bot-123 swarming_task_id 123456 --key arch arm64 compiler Clang cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model PixelC os Android; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/nanobench.sh" ], @@ -660,6 +681,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release.json index f4109ee83f..7460649d3a 100644 --- a/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release.json @@ -134,7 +134,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -145,7 +148,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -280,7 +286,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -291,7 +300,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -426,7 +438,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -437,7 +452,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -773,6 +791,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json index 036f318048..f8dc89cc5f 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug.json @@ -98,7 +98,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -109,7 +112,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json index d4240f1f76..8c1994f034 100644 --- a/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release.json @@ -98,7 +98,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -109,7 +112,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -388,6 +394,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json index 21fa833d97..43bfd6058c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -218,6 +235,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json index 2a9b6e9866..db0696634b 100644 --- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json index 1d367202b7..ddcbc25863 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -223,6 +240,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 5a25fc9df1..8b1c4e9ea5 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index f9891186f1..280a3d1a30 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 459e004bb7..5978c31a54 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json index bf8266bdbb..19c81e1625 100644 --- a/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release/data" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -224,6 +241,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json index 88e2edd08d..76446eb87c 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE\\data" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -219,6 +236,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE\\data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json index 1da89e952c..5bb9faa063 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE\\data" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -214,6 +231,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-ANGLE\\data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json index 476ad0aa77..34df8cb993 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan\\data" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -229,6 +246,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Release-Vulkan\\data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json index 39ba894115..11c1f65cb8 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json +++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -217,6 +234,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE\\data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug.json index 123de9e2c4..f8a8242943 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], diff --git a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json index d489b1a894..a107e10392 100644 --- a/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release\\data" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -217,6 +234,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]\\perfdata\\Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release\\data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index a9b4443308..b33d45bfb7 100644 --- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -69,7 +69,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -84,7 +87,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -198,7 +204,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -327,7 +339,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -342,7 +357,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -621,6 +639,7 @@ "IOS_BUNDLE_ID": "com.google.nanobench", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" }, + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.expected/trybot.json b/infra/bots/recipes/perf.expected/trybot.json index 27b0da6f5e..0193fb5232 100644 --- a/infra/bots/recipes/perf.expected/trybot.json +++ b/infra/bots/recipes/perf.expected/trybot.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree data" }, @@ -222,6 +239,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py index d9f4c7f882..d58953dbff 100644 --- a/infra/bots/recipes/perf.py +++ b/infra/bots/recipes/perf.py @@ -12,13 +12,13 @@ import calendar DEPS = [ 'core', 'env', - 'file', 'flavor', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/platform', 'recipe_engine/properties', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', 'recipe_engine/time', 'run', @@ -309,7 +309,7 @@ def perf_steps(api): # Copy results to swarming out dir. if api.vars.upload_perf_results: - api.file.makedirs('perf_dir', api.vars.perf_data_dir) + api.shutil.makedirs('perf_dir', api.vars.perf_data_dir, infra_step=True) api.flavor.copy_directory_contents_to_host( api.flavor.device_dirs.perf_data_dir, api.vars.perf_data_dir) diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json index f8d0153533..8ee92cfcde 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Nightly-RecreateSKPs_Canary.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -171,7 +167,9 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/skp_output" ], @@ -186,6 +184,7 @@ "[START_DIR]/skp_output", "511" ], + "infra_step": true, "name": "makedirs skp_output", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json index 4954a85634..26786146cf 100644 --- a/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json +++ b/infra/bots/recipes/recreate_skps.expected/Housekeeper-Weekly-RecreateSKPs.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -171,7 +167,9 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/skp_output" ], @@ -186,6 +184,7 @@ "[START_DIR]/skp_output", "511" ], + "infra_step": true, "name": "makedirs skp_output", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/recreate_skps.expected/failed_upload.json b/infra/bots/recipes/recreate_skps.expected/failed_upload.json index 45d7759163..2155c65b8e 100644 --- a/infra/bots/recipes/recreate_skps.expected/failed_upload.json +++ b/infra/bots/recipes/recreate_skps.expected/failed_upload.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ @@ -171,7 +167,9 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[START_DIR]/skp_output" ], @@ -186,6 +184,7 @@ "[START_DIR]/skp_output", "511" ], + "infra_step": true, "name": "makedirs skp_output", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/recreate_skps.py b/infra/bots/recipes/recreate_skps.py index 8ca604c44d..1d4968605f 100644 --- a/infra/bots/recipes/recreate_skps.py +++ b/infra/bots/recipes/recreate_skps.py @@ -7,16 +7,17 @@ DEPS = [ + 'core', 'depot_tools/gclient', - 'file', + 'infra', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', - 'core', - 'infra', 'run', 'vars', ] @@ -58,8 +59,8 @@ def RunSteps(api): # Clean up the output dir. output_dir = api.path['start_dir'].join('skp_output') if api.path.exists(output_dir): - api.file.rmtree('skp_output', output_dir) - api.file.makedirs('skp_output', output_dir) + api.run.rmtree(output_dir) + api.shutil.makedirs('skp_output', output_dir, infra_step=True) # Capture the SKPs. asset_dir = api.vars.infrabots_dir.join('assets', 'skp') diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json index 5b5ed5727c..6d31aa0ff6 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench.json @@ -44,7 +44,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -55,7 +58,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -260,6 +266,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json index 516306389c..6cbc4f7ea5 100644 --- a/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json +++ b/infra/bots/recipes/skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench.json @@ -44,7 +44,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -55,7 +58,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -260,6 +266,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Vulkan_Skpbench/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/skpbench.expected/trybot.json b/infra/bots/recipes/skpbench.expected/trybot.json index 67dc3e01f3..f9f5609f85 100644 --- a/infra/bots/recipes/skpbench.expected/trybot.json +++ b/infra/bots/recipes/skpbench.expected/trybot.json @@ -44,7 +44,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -55,7 +58,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -260,6 +266,7 @@ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-Android_Skpbench/data", "511" ], + "infra_step": true, "name": "makedirs perf_dir", "~followup_annotations": [ "@@@STEP_LOG_LINE@python.inline@@@@", diff --git a/infra/bots/recipes/skpbench.py b/infra/bots/recipes/skpbench.py index 1d416f7897..d4b134f735 100644 --- a/infra/bots/recipes/skpbench.py +++ b/infra/bots/recipes/skpbench.py @@ -11,12 +11,12 @@ import calendar DEPS = [ 'core', - 'file', 'recipe_engine/context', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', 'recipe_engine/time', 'run', @@ -76,7 +76,7 @@ def skpbench_steps(api): now = api.time.utcnow() ts = int(calendar.timegm(now.utctimetuple())) - api.file.makedirs('perf_dir', api.vars.perf_data_dir) + api.shutil.makedirs('perf_dir', api.vars.perf_data_dir, infra_step=True) json_path = api.path.join( api.vars.perf_data_dir, 'skpbench_%s_%d.json' % (api.vars.got_revision, ts)) diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json index 90e6b67644..c435505581 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-AndroidOne-GPU-Mali400MP2-arm-Release-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Mali400MP2 extra_config Android model AndroidOne os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW _ gm _ bigblurs _ gm _ bleed _ gm _ bleed_alpha_bmp _ gm _ bleed_alpha_bmp_shader _ gm _ bleed_alpha_image _ gm _ bleed_alpha_image_shader _ gm _ bleed_image _ gm _ dropshadowimagefilter _ gm _ filterfastbounds gles gm _ imageblurtiled _ gm _ imagefiltersclipped _ gm _ imagefiltersscaled _ gm _ imageresizetiled _ gm _ matrixconvolution _ gm _ strokedlines glesmsaa4 gm _ imageblurtiled glesmsaa4 gm _ imagefiltersbase --match ~WritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json index 014bfb7892..b69ae2037c 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Ci20-CPU-IngenicJZ4780-mipsel-Release-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch mipsel compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value IngenicJZ4780 extra_config Android model Ci20 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --randomProcessorTest --config 8888 --src tests gm image colorImage svg --blacklist _ test _ GrShape _ gm _ fast_slow_blurimagefilter --match ~Codec_Dimensions ~FontMgrAndroidParser ~PathOpsSimplify; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json index dae3e335d5..047049b8f3 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-GalaxyS6-GPU-MaliT760-arm64-Debug-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value MaliT760 extra_config Android model GalaxyS6 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~SpecialImage ~skbug6653; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json index 65bdbf783b..459fa14e9a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-GalaxyS7_G930A-GPU-Adreno530-arm64-Debug-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config Android model GalaxyS7_G930A os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~WritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json index 626a5beb8e..ad84597c39 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value TegraX1 extra_config Android model NVIDIA_Shield os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gl gldft glsrgb glmsaa4 glinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glinst --src tests gm image colorImage svg --blacklist glsrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json index 7a6226c99e..a4e3838322 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Release-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface ~SRGBReadWritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json index 12a2e34192..047aa50a35 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus5-GPU-Adreno330-arm-Release-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value Adreno330 extra_config Android model Nexus5 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW _ gm _ encode-platform --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json index 5650f3f1cd..c89baf0b3f 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-Android_Vulkan swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno430 extra_config Android_Vulkan model Nexus6p os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config vk --src tests gm image colorImage svg --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json index cf56b7ee8f..ad25ca43d7 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json index 8732752706..1a92b701d9 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-NexusPlayer-CPU-SSE4-x86-Release-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu CPU cpu_or_gpu_value SSE4 extra_config Android model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --randomProcessorTest --config 8888 srgb gles glessrgb --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape --match ~ResourceCache --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json index 85f24c9f52..911ef05c3a 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-NexusPlayer-GPU-PowerVR-x86-Release-Android_Vulkan swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch x86 compiler Clang configuration Release cpu_or_gpu GPU cpu_or_gpu_value PowerVR extra_config Android_Vulkan model NexusPlayer os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config vk --src tests gm colorImage --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~ResourceCache ~gradients_no_texture$ ~tilemodes ~shadertext$ ~bitmapfilters ~GrContextFactory_abandon --noRAW_threading; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json index 569b645e15..0ca2cf67a2 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu CPU cpu_or_gpu_value TegraX1 extra_config Android model PixelC os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nogpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 glesinstdit4 serialize-8888 tiles_rt-8888 pic-8888 glesinst --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan.json b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan.json index 0baf9d99e9..4a73713603 100644 --- a/infra/bots/recipes/test.expected/Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-PixelXL-GPU-Adreno530-arm64-Debug-Android_Vulkan swarming_bot_id skia-bot-123 swarming_task_id 123456 --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm64 compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Adreno530 extra_config Android_Vulkan model PixelXL os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config vk --src tests gm image colorImage svg --blacklist _ test _ GrShape _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json index 26b0a1b2c1..1cb43f5387 100644 --- a/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json +++ b/infra/bots/recipes/test.expected/Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug.json @@ -134,7 +134,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -145,7 +148,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -280,7 +286,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -291,7 +300,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -426,7 +438,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -437,7 +452,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -572,13 +590,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json index 0e625b0f63..7a62324d59 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json index 233dee09a0..5e0d2cfd3b 100644 --- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json +++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json index 5e4fcb6511..85713260e0 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json index 2d1dc6081e..b2cb89aca7 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json index 45afba31e6..3e2e5cec68 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-SK_FORCE_RASTER_PIPELINE_BLITTER.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json index 57f605700f..2fb359604a 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json index 3a7f99bc9d..555732082e 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json index f4b2d38bef..ad1c343a87 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug-SK_USE_DISCARDABLE_SCALEDIMAGECACHE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json index c034e37dfc..160be4e296 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json index 264fe28d73..0a677f4d2b 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json index 0ea65400b0..2c24d33141 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_AbandonGpuContext.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json index 5a20892df0..d0dd3ce7e0 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind_PreAbandonGpuContext.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json index e35706b5fe..2f6238cf09 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json index ef7f48d21d..9d718f86a6 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json index 77a5c79510..e25fc6307c 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUC6i5SYK-GPU-IntelIris540-x86_64-Release.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json index 6372b5033c..06473b4056 100644 --- a/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Ubuntu16-Clang-NUCDE3815TYKHE-GPU-IntelBayTrail-x86_64-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json index 225b46a96f..b13fc56fe8 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json index 5c4b78a51c..9f2e2bc4ab 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC5i7RYH-GPU-IntelIris6100-x86_64-Release-ReleaseAndAbandonGpuContext.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json index 13c2f1a080..faa23da982 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-ANGLE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json index 7602b5f32d..9f1dbd1785 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-NUC6i5SYK-GPU-IntelIris540-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json index 29e9b5ee54..60a22bc147 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json index 3f523de20b..7eb5f18ed1 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json index a1b77ea7a2..75bacb23a7 100644 --- a/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json +++ b/infra/bots/recipes/test.expected/Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json index 3eec115093..c9dd04fa28 100644 --- a/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json +++ b/infra/bots/recipes/test.expected/Test-Win8-MSVC-Golo-CPU-AVX-x86-Debug.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skp\\VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\skimage\\VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]\\skia\\infra\\bots\\assets\\svg\\VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]\\tmp\\SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]\\resources\\fileutil.py", + "RECIPE_MODULE[recipe_engine::file]\\resources\\fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]\\dm" ], - "env": { - "PYTHONPATH": "[START_DIR]\\skia\\infra\\bots\\.recipe_deps\\build\\scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 6aa00b69df..8bb1f20799 100644 --- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -69,7 +69,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -84,7 +87,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -198,7 +204,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -327,7 +339,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -342,7 +357,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -456,14 +474,15 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], "env": { "IOS_BUNDLE_ID": "com.google.dm", - "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" + "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice" }, "infra_step": true, "name": "rmtree dm" diff --git a/infra/bots/recipes/test.expected/failed_dm.json b/infra/bots/recipes/test.expected/failed_dm.json index a6d73f08ec..dccd54070c 100644 --- a/infra/bots/recipes/test.expected/failed_dm.json +++ b/infra/bots/recipes/test.expected/failed_dm.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.expected/failed_get_hashes.json b/infra/bots/recipes/test.expected/failed_get_hashes.json index bcb9e35b2a..9b455528a8 100644 --- a/infra/bots/recipes/test.expected/failed_get_hashes.json +++ b/infra/bots/recipes/test.expected/failed_get_hashes.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -703,7 +720,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus7-GPU-Tegra3-arm-Debug-Android swarming_bot_id \"\" swarming_task_id \"\" --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config Android model Nexus7 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/failed_pull.json b/infra/bots/recipes/test.expected/failed_pull.json index 9b83ecb188..d3fd49359b 100644 --- a/infra/bots/recipes/test.expected/failed_pull.json +++ b/infra/bots/recipes/test.expected/failed_pull.json @@ -56,7 +56,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -67,7 +70,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -202,7 +208,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -213,7 +222,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -348,7 +360,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -359,7 +374,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -494,13 +512,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, @@ -701,7 +718,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "set -x; /data/local/tmp/dm --undefok --resourcePath /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/dm --colorImages /sdcard/revenge_of_the_skiabot/images/colorspace --nameByHash --properties gitHash abc123 builder Test-Android-Clang-Nexus10-GPU-MaliT604-arm-Debug-Android swarming_bot_id \"\" swarming_task_id \"\" --svgs /sdcard/revenge_of_the_skiabot/svgs --key arch arm compiler Clang configuration Debug cpu_or_gpu GPU cpu_or_gpu_value MaliT604 extra_config Android model Nexus10 os Android --uninterestingHashesFile /sdcard/revenge_of_the_skiabot/uninteresting_hashes.txt --writePath /sdcard/revenge_of_the_skiabot/dm_out --nocpu --randomProcessorTest --config 8888 srgb gles glesdft glessrgb glesmsaa4 serialize-8888 tiles_rt-8888 pic-8888 --src tests gm image colorImage svg --blacklist glessrgb image _ _ _ test _ GrShape serialize-8888 gm _ bleed_image serialize-8888 gm _ c_gms serialize-8888 gm _ colortype serialize-8888 gm _ colortype_xfermodes serialize-8888 gm _ drawfilter serialize-8888 gm _ fontmgr_bounds_0.75_0 serialize-8888 gm _ fontmgr_bounds_1_-0.25 serialize-8888 gm _ fontmgr_bounds serialize-8888 gm _ fontmgr_match serialize-8888 gm _ fontmgr_iter serialize-8888 gm _ imagemasksubset serialize-8888 gm _ bitmapfilters serialize-8888 gm _ bitmapshaders serialize-8888 gm _ bleed serialize-8888 gm _ bleed_alpha_bmp serialize-8888 gm _ bleed_alpha_bmp_shader serialize-8888 gm _ convex_poly_clip serialize-8888 gm _ extractalpha serialize-8888 gm _ filterbitmap_checkerboard_32_32_g8 serialize-8888 gm _ filterbitmap_image_mandrill_64 serialize-8888 gm _ shadows serialize-8888 gm _ simpleaaclip_aaclip serialize-8888 gm _ composeshader_bitmap serialize-8888 gm _ scaled_tilemodes_npot serialize-8888 gm _ scaled_tilemodes serialize-8888 gm _ typefacerendering_pfaMac serialize-8888 gm _ parsedpaths serialize-8888 gm _ ImageGeneratorExternal_rect serialize-8888 gm _ ImageGeneratorExternal_shader serialize-8888 gm _ shadow_utils serialize-8888 gm _ makecolorspace serialize-8888 gm _ bleed_alpha_image serialize-8888 gm _ bleed_alpha_image_shader serialize-8888 gm _ verylargebitmap serialize-8888 gm _ verylarge_picture_image pic-8888 gm _ drawfilter pic-8888 gm _ image-cacherator-from-picture serialize-8888 gm _ image-cacherator-from-picture pic-8888 gm _ image-cacherator-from-raster serialize-8888 gm _ image-cacherator-from-raster pic-8888 gm _ image-cacherator-from-ctable serialize-8888 gm _ image-cacherator-from-ctable pic-8888 gm _ gamut serialize-8888 gm _ gamut pic-8888 gm _ complexclip4_bw serialize-8888 gm _ complexclip4_bw pic-8888 gm _ complexclip4_aa serialize-8888 gm _ complexclip4_aa tiles_rt-8888 gm _ complexclip4_bw tiles_rt-8888 gm _ complexclip4_aa _ image _ interlaced1.png _ image _ interlaced2.png _ image _ interlaced3.png _ image _ .arw _ image _ .cr2 _ image _ .dng _ image _ .nef _ image _ .nrw _ image _ .orf _ image _ .raf _ image _ .rw2 _ image _ .pef _ image _ .srw _ image _ .ARW _ image _ .CR2 _ image _ .DNG _ image _ .NEF _ image _ .NRW _ image _ .ORF _ image _ .RAF _ image _ .RW2 _ image _ .PEF _ image _ .SRW --match ~CopySurface ~SRGBReadWritePixels; echo $? >/data/local/tmp/rc", "[START_DIR]/tmp/dm.sh" ], diff --git a/infra/bots/recipes/test.expected/trybot.json b/infra/bots/recipes/test.expected/trybot.json index c08e0d5dc9..01007aeb7e 100644 --- a/infra/bots/recipes/test.expected/trybot.json +++ b/infra/bots/recipes/test.expected/trybot.json @@ -3,7 +3,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skp/VERSION", "/path/to/tmp/" ], @@ -14,7 +17,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SKP_VERSION" ], @@ -25,7 +31,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/skimage/VERSION", "/path/to/tmp/" ], @@ -36,7 +45,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SK_IMAGE_VERSION" ], @@ -47,7 +59,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "[START_DIR]/skia/infra/bots/assets/svg/VERSION", "/path/to/tmp/" ], @@ -58,7 +73,10 @@ "cmd": [ "python", "-u", - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "copy", "42", "[START_DIR]/tmp/SVG_VERSION" ], @@ -69,13 +87,12 @@ "cmd": [ "python", "-u", - "RECIPE_MODULE[skia::file]/resources/fileutil.py", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", "rmtree", "[CUSTOM_[SWARM_OUT_DIR]]/dm" ], - "env": { - "PYTHONPATH": "[START_DIR]/skia/infra/bots/.recipe_deps/build/scripts" - }, "infra_step": true, "name": "rmtree dm" }, diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 2d217d84e1..46c42be190 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -9,7 +9,6 @@ DEPS = [ 'core', 'env', - 'file', 'flavor', 'recipe_engine/context', 'recipe_engine/json', @@ -18,6 +17,7 @@ DEPS = [ 'recipe_engine/properties', 'recipe_engine/python', 'recipe_engine/raw_io', + 'recipe_engine/shutil', 'recipe_engine/step', 'run', 'vars', @@ -583,10 +583,10 @@ def test_steps(api): hash_filename = 'uninteresting_hashes.txt' # Ensure that the tmp_dir exists. - api.run.run_once(api.file.makedirs, - 'tmp_dir', - api.vars.tmp_dir, - infra_step=True) + api.run.run_once(api.shutil.makedirs, + 'tmp_dir', + api.vars.tmp_dir, + infra_step=True) host_hashes_file = api.vars.tmp_dir.join(hash_filename) hashes_file = api.flavor.device_path_join( diff --git a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json index b5d10bcc3a..1783481428 100644 --- a/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json +++ b/infra/bots/recipes/update_meta_config.expected/Housekeeper-Nightly-UpdateMetaConfig.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/update_meta_config.expected/failed_update.json b/infra/bots/recipes/update_meta_config.expected/failed_update.json index 1d62b38e85..e2f8e0f55c 100644 --- a/infra/bots/recipes/update_meta_config.expected/failed_update.json +++ b/infra/bots/recipes/update_meta_config.expected/failed_update.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/update_meta_config.expected/trybot_test.json b/infra/bots/recipes/update_meta_config.expected/trybot_test.json index f66431922e..29b404cfda 100644 --- a/infra/bots/recipes/update_meta_config.expected/trybot_test.json +++ b/infra/bots/recipes/update_meta_config.expected/trybot_test.json @@ -26,18 +26,14 @@ "cmd": [ "python", "-u", - "\nimport os\nimport sys\nos.remove(sys.argv[1])\n", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "remove", "[CUSTOM_/_B_WORK]/.gclient_entries" ], "infra_step": true, - "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries", - "~followup_annotations": [ - "@@@STEP_LOG_LINE@python.inline@@@@", - "@@@STEP_LOG_LINE@python.inline@import os@@@", - "@@@STEP_LOG_LINE@python.inline@import sys@@@", - "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@", - "@@@STEP_LOG_END@python.inline@@@" - ] + "name": "remove [CUSTOM_/_B_WORK]/.gclient_entries" }, { "cmd": [ diff --git a/infra/bots/recipes/update_meta_config.py b/infra/bots/recipes/update_meta_config.py index a3ca4f6ddd..a8f17cc03b 100644 --- a/infra/bots/recipes/update_meta_config.py +++ b/infra/bots/recipes/update_meta_config.py @@ -8,8 +8,8 @@ DEPS = [ 'depot_tools/gclient', - 'file', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/python', diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_all.json b/infra/bots/recipes/upload_dm_results.expected/failed_all.json index 8b27acaa34..2966786e78 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_all.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_all.json @@ -78,18 +78,26 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/dm/*" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.png" ], "infra_step": true, - "name": "find images" + "name": "find images", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -102,7 +110,7 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)", @@ -115,7 +123,7 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 3)", @@ -128,7 +136,7 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 4)", @@ -141,7 +149,7 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 5)", diff --git a/infra/bots/recipes/upload_dm_results.expected/failed_once.json b/infra/bots/recipes/upload_dm_results.expected/failed_once.json index 6f4e599618..9d6af8d00c 100644 --- a/infra/bots/recipes/upload_dm_results.expected/failed_once.json +++ b/infra/bots/recipes/upload_dm_results.expected/failed_once.json @@ -78,18 +78,26 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/dm/*" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.png" ], "infra_step": true, - "name": "find images" + "name": "find images", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images", @@ -102,13 +110,32 @@ "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images (attempt 2)" }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.pdf" + ], + "infra_step": true, + "name": "find images (2)", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ "gsutil", "cp", "-z", diff --git a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json index 7c90e99269..0d0b3c1267 100644 --- a/infra/bots/recipes/upload_dm_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_dm_results.expected/normal_bot.json @@ -78,24 +78,51 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/dm/*" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.png" ], "infra_step": true, - "name": "find images" + "name": "find images", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.pdf" + ], + "infra_step": true, + "name": "find images (2)", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ "gsutil", "cp", "-z", diff --git a/infra/bots/recipes/upload_dm_results.expected/trybot.json b/infra/bots/recipes/upload_dm_results.expected/trybot.json index 529b0d8e29..9f733a7e7f 100644 --- a/infra/bots/recipes/upload_dm_results.expected/trybot.json +++ b/infra/bots/recipes/upload_dm_results.expected/trybot.json @@ -78,24 +78,51 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/dm/*" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.png" ], "infra_step": true, - "name": "find images" + "name": "find images", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ "gsutil", "cp", - "[START_DIR]/dm/*", + "[START_DIR]/dm/*.png", "gs://skia-infra-gm/dm-images-v1" ], "name": "upload images" }, { "cmd": [ + "python", + "-u", + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/dm", + "*.pdf" + ], + "infra_step": true, + "name": "find images (2)", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/dm/someimage.png@@@", + "@@@STEP_LOG_END@glob@@@" + ] + }, + { + "cmd": [ "gsutil", "cp", "-z", diff --git a/infra/bots/recipes/upload_dm_results.py b/infra/bots/recipes/upload_dm_results.py index d919f59077..acfb426170 100644 --- a/infra/bots/recipes/upload_dm_results.py +++ b/infra/bots/recipes/upload_dm_results.py @@ -10,7 +10,7 @@ import calendar DEPS = [ - 'file', + 'recipe_engine/file', 'recipe_engine/json', 'recipe_engine/path', 'recipe_engine/properties', @@ -62,13 +62,16 @@ def RunSteps(api): # Upload the images. image_dest_path = 'gs://%s/dm-images-v1' % api.properties['gs_bucket'] - files_to_upload = api.file.glob( - 'find images', - results_dir.join('*'), - test_data=[results_dir.join('someimage.png')], - infra_step=True) - if len(files_to_upload) > 0: - cp(api, 'images', results_dir.join('*'), image_dest_path) + for ext in ['.png', '.pdf']: + files_to_upload = api.file.glob_paths( + 'find images', + results_dir, + '*%s' % ext, + test_data=['someimage.png']) + # For some reason, glob returns results_dir when it should return nothing. + files_to_upload = [f for f in files_to_upload if str(f).endswith(ext)] + if len(files_to_upload) > 0: + cp(api, 'images', results_dir.join('*%s' % ext), image_dest_path) # Upload the JSON summary and verbose.log. now = api.time.utcnow() diff --git a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json index cc175d701d..12810fdec1 100644 --- a/infra/bots/recipes/upload_nano_results.expected/normal_bot.json +++ b/infra/bots/recipes/upload_nano_results.expected/normal_bot.json @@ -3,13 +3,21 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/*.json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", + "*.json" ], "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", "infra_step": true, - "name": "find results" + "name": "find results", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/nanobench_abc123.json@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/upload_nano_results.expected/trybot.json b/infra/bots/recipes/upload_nano_results.expected/trybot.json index a601095619..1e7a453895 100644 --- a/infra/bots/recipes/upload_nano_results.expected/trybot.json +++ b/infra/bots/recipes/upload_nano_results.expected/trybot.json @@ -3,13 +3,21 @@ "cmd": [ "python", "-u", - "\nimport glob\nimport sys\nwith open(sys.argv[1], 'w') as f:\n f.write('\\n'.join(glob.glob(sys.argv[2])))\n", - "/path/to/tmp/", - "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/*.json" + "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py", + "--json-output", + "/path/to/tmp/json", + "glob", + "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", + "*.json" ], "cwd": "[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data", "infra_step": true, - "name": "find results" + "name": "find results", + "stdout": "/path/to/tmp/", + "~followup_annotations": [ + "@@@STEP_LOG_LINE@glob@[START_DIR]/perfdata/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug/data/nanobench_abc123.json@@@", + "@@@STEP_LOG_END@glob@@@" + ] }, { "cmd": [ diff --git a/infra/bots/recipes/upload_nano_results.py b/infra/bots/recipes/upload_nano_results.py index 1bf4ef1d54..0f99a7c857 100644 --- a/infra/bots/recipes/upload_nano_results.py +++ b/infra/bots/recipes/upload_nano_results.py @@ -7,8 +7,8 @@ DEPS = [ - 'file', 'recipe_engine/context', + 'recipe_engine/file', 'recipe_engine/path', 'recipe_engine/properties', 'recipe_engine/step', @@ -24,11 +24,11 @@ def RunSteps(api): src_path = api.path['start_dir'].join( 'perfdata', builder_name, 'data') with api.context(cwd=src_path): - results = api.file.glob( + results = api.file.glob_paths( 'find results', - src_path.join('*.json'), - test_data=[src_path.join('nanobench_abc123.json')], - infra_step=True) + src_path, + '*.json', + test_data=['nanobench_abc123.json']) if len(results) != 1: # pragma: nocover raise Exception('Unable to find nanobench or skpbench JSON file!') |