| Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| index 0c5c3ebfca86ebdc22d38b756c0681124c1bbc96..16b056743a4c4de0aa4246bca5ec65d0d33df4d5 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release-Swarming.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]"
|
| },
|
| @@ -68,7 +67,6 @@
|
| "--output-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -142,7 +140,6 @@
|
| "--url",
|
| "https://chromium.googlesource.com/external/swarming.client.git"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "git setup (swarming_client)"
|
| },
|
| {
|
| @@ -217,7 +214,6 @@
|
| "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| "--version"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "swarming.py --version",
|
| "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| @@ -235,7 +231,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/linux64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go linux"
|
| },
|
| {
|
| @@ -249,7 +244,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/mac64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go mac"
|
| },
|
| {
|
| @@ -263,7 +257,6 @@
|
| "-d",
|
| "[SLAVE_BUILD]/skia/infra/bots/tools/luci-go/win64"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "download luci-go win"
|
| },
|
| {
|
| @@ -273,7 +266,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@@@@",
|
| @@ -295,7 +287,6 @@
|
| "[SLAVE_BUILD]/luci-go",
|
| "0"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Copy Go binary"
|
| },
|
| {
|
| @@ -306,7 +297,6 @@
|
| "[BUILD]/third_party/infra",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs third_party_infra",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -329,7 +319,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -352,7 +341,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"
|
| },
|
| {
|
| @@ -369,7 +357,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@{@@@",
|
| @@ -431,7 +418,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -454,7 +440,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 \"Mac\", \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"
|
| },
|
| {
|
| @@ -471,7 +456,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@{@@@",
|
| @@ -489,7 +473,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@@@@",
|
| @@ -514,7 +497,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/"
|
| },
|
| @@ -581,7 +563,6 @@
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "revision=164710"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] compile_skia on Mac",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -614,7 +595,6 @@
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "compile_skia on Mac",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -667,7 +647,6 @@
|
| "[SLAVE_BUILD]/tmp",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs tmp_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -690,7 +669,6 @@
|
| "[SLAVE_BUILD]/tmp/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SKP_VERSION"
|
| },
|
| {
|
| @@ -701,7 +679,6 @@
|
| "[SLAVE_BUILD]/skia/SKP_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SKP_VERSION"
|
| },
|
| {
|
| @@ -712,7 +689,6 @@
|
| "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get downloaded SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -723,7 +699,6 @@
|
| "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
|
| "/path/to/tmp/"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Get expected SK_IMAGE_VERSION"
|
| },
|
| {
|
| @@ -734,7 +709,6 @@
|
| "[SLAVE_BUILD]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "makedirs swarming tmp dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -757,7 +731,6 @@
|
| "{\n \"args\": [\n \"--isolate\", \n \"[SLAVE_BUILD]/skia/infra/bots/test_skia.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated\", \n \"--config-variable\", \n \"OS\", \n \"Mac\", \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/test_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "Write test_skia.isolated.gen.json"
|
| },
|
| {
|
| @@ -774,7 +747,6 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/swarming_temp_dir/test_skia.isolated.gen.json"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "isolate tests (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -793,7 +765,6 @@
|
| "[dummy hash for isolate_recipes]",
|
| "abc123"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "add_isolated_input (2)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -818,7 +789,6 @@
|
| "https://isolateserver.appspot.com",
|
| "[SLAVE_BUILD]/swarming_temp_dir/skia-task-test_skia.isolated"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "upload new .isolated file for test_skia",
|
| "stdout": "/path/to/tmp/"
|
| },
|
| @@ -884,7 +854,6 @@
|
| "swarm_out_dir=${ISOLATED_OUTDIR}",
|
| "revision=164710"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "[trigger] test_skia on Mac",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| @@ -908,7 +877,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/test_skia"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree results_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -939,7 +907,6 @@
|
| "--task-output-dir",
|
| "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "test_skia on Mac",
|
| "~followup_annotations": [
|
| "@@@STEP_TEXT@swarming pending 71s@@@",
|
| @@ -991,7 +958,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]/dm"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "rmtree dm_dir",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| @@ -1013,7 +979,6 @@
|
| "[SLAVE_BUILD]/dm",
|
| "0"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]",
|
| "name": "dm_dir"
|
| },
|
| {
|
|
|