| Index: scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| index 9d901ecdf186efdaaf8f760bc497714eecd8b1b2..9cdc8ce648471b979bb9c2962e4ed49f60115cd2 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot.json
|
| @@ -47,7 +47,6 @@
|
| "--spec",
|
| "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -61,7 +60,6 @@
|
| ".",
|
| "[DEPOT_TOOLS]/gclient"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "gclient revert"
|
| },
|
| {
|
| @@ -79,7 +77,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -111,7 +108,6 @@
|
| "https://codereview.chromium.org",
|
| "--no-auth"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "apply_issue",
|
| "~followup_annotations": [
|
| "@@@STEP_LINK@Applied issue 500@https://codereview.chromium.org/500@@@"
|
| @@ -172,7 +168,6 @@
|
| "--url",
|
| "https://chromium.googlesource.com/external/swarming.client.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "git setup (swarming_client)"
|
| },
|
| {
|
| @@ -247,7 +242,6 @@
|
| "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -265,7 +259,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go linux"
|
| },
|
| {
|
| @@ -279,7 +272,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go mac"
|
| },
|
| {
|
| @@ -293,7 +285,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go win"
|
| },
|
| {
|
| @@ -303,7 +294,6 @@
|
| "\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",
|
| "[SLAVE_BUILD]/luci-go"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree Go binary dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -325,7 +315,6 @@
|
| "[SLAVE_BUILD]/luci-go",
|
| "0"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Copy Go binary"
|
| },
|
| {
|
| @@ -336,7 +325,6 @@
|
| "[BUILD]/third_party/infra",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs third_party_infra",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -359,7 +347,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -382,7 +369,6 @@
|
| "{\n \"args\": [\n \"--isolate\", \n \"[BUILD]/scripts/slave/recipes/skia/swarm_recipe.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_recipes.isolated\", \n \"--config-variable\", \n \"OS\", \n \"linux\"\n ], \n \"dir\": \"[BUILD]/scripts/slave/recipes/skia\", \n \"version\": 1\n}",
|
| "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write isolate_recipes.isolated.gen.json"
|
| },
|
| {
|
| @@ -399,7 +385,6 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/swarming_temp_dir/isolate_recipes.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -459,7 +444,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -482,7 +466,6 @@
|
| "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/compile_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write compile_skia.isolated.gen.json"
|
| },
|
| {
|
| @@ -499,7 +482,6 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -517,7 +499,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated",
|
| "[dummy hash for isolate_recipes]"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "add_isolated_input",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -542,7 +523,6 @@
|
| "https://isolateserver.appspot.com",
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-compile_skia.isolated"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "upload new .isolated file for compile_skia",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -614,7 +594,6 @@
|
| "issue=500",
|
| "revision=164710"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] compile_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -647,7 +626,6 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "compile_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -700,7 +678,6 @@
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -723,7 +700,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -734,7 +710,6 @@
|
| "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -745,7 +720,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -756,7 +730,6 @@
|
| "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -767,7 +740,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -790,7 +762,6 @@
|
| "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/perf_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Ubuntu\", \n \"--blacklist\", \n \".git\", \n \"--blacklist\", \n \"out\", \n \"--blacklist\", \n \"*.pyc\", \n \"--extra-variable\", \n \"WORKDIR\", \n \"[SLAVE_BUILD]\", \n \"--extra-variable\", \n \"BUILD\", \n \"[BUILD]\"\n ], \n \"dir\": \"[SLAVE_BUILD]\", \n \"version\": 1\n}",
|
| "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write perf_skia.isolated.gen.json"
|
| },
|
| {
|
| @@ -807,7 +778,6 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/swarming_temp_dir/perf_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -826,7 +796,6 @@
|
| "[dummy hash for isolate_recipes]",
|
| "abc123"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "add_isolated_input (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -851,7 +820,6 @@
|
| "https://isolateserver.appspot.com",
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-perf_skia.isolated"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "upload new .isolated file for perf_skia",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -922,7 +890,6 @@
|
| "issue=500",
|
| "revision=164710"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] perf_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -946,7 +913,6 @@
|
| "\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",
|
| "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree results_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -977,7 +943,6 @@
|
| "--task-output-dir",
|
| "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "perf_skia on Ubuntu",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -1041,7 +1006,6 @@
|
| "\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",
|
| "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree perf_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -1062,7 +1026,6 @@
|
| "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs perf_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -1085,7 +1048,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir/outputs/perf_skia/0/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710.json",
|
| "[SLAVE_BUILD]/perfdata/Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Swarming-Trybot/data/nanobench_164710_1408633190.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "perf_results"
|
| },
|
| {
|
|
|