| Index: infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json
|
| diff --git a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json
|
| similarity index 84%
|
| copy from infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| copy to infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json
|
| index f89798ab7977d013f056d48800bd98f9ed7d7359..887fd4f6c395f6497be69898d26e030e929ba40b 100644
|
| --- a/infra/bots/recipes/swarm_perf.expected/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind.json
|
| +++ b/infra/bots/recipes/swarm_perf.expected/recipe_with_gerrit_patch.json
|
| @@ -3,6 +3,28 @@
|
| "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",
|
| + "[SLAVE_BUILD]/tmp",
|
| + "511"
|
| + ],
|
| + "name": "makedirs tmp_dir",
|
| + "~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",
|
| "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
|
| "/path/to/tmp/"
|
| @@ -64,7 +86,7 @@
|
| "python",
|
| "-u",
|
| "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data"
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data"
|
| ],
|
| "env": {
|
| "PYTHONPATH": "[SLAVE_BUILD]/skia/infra/bots/.recipe_deps/build/scripts"
|
| @@ -86,7 +108,7 @@
|
| "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",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data",
|
| "511"
|
| ],
|
| "name": "makedirs data",
|
| @@ -170,12 +192,18 @@
|
| "~inc0.webp",
|
| "~inc1.webp",
|
| "--outResultsFile",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data/nanobench_abc123.json",
|
| "--properties",
|
| "gitHash",
|
| "abc123",
|
| "build_number",
|
| "5",
|
| + "issue",
|
| + "2100",
|
| + "patchset",
|
| + "2",
|
| + "patch_storage",
|
| + "gerrit",
|
| "--key",
|
| "arch",
|
| "x86_64",
|
| @@ -266,12 +294,18 @@
|
| "~inc0.webp",
|
| "~inc1.webp",
|
| "--outResultsFile",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data/nanobench_abc123.json",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data/nanobench_abc123.json",
|
| "--properties",
|
| "gitHash",
|
| "abc123",
|
| "build_number",
|
| "5",
|
| + "issue",
|
| + "2100",
|
| + "patchset",
|
| + "2",
|
| + "patch_storage",
|
| + "gerrit",
|
| "--key",
|
| "arch",
|
| "x86_64",
|
| @@ -302,7 +336,7 @@
|
| "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",
|
| - "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind/data",
|
| + "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind-Trybot/data",
|
| "511"
|
| ],
|
| "name": "makedirs perf_dir",
|
|
|