| Index: scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
|
| diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
|
| similarity index 90%
|
| copy from scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json
|
| copy to scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
|
| index d89533963b0a453358c2cea9c54c956540718c7a..58af3de2ccda67974778d79fc318dcbe8b95eb55 100644
|
| --- a/scripts/slave/recipes/skia/swarm_trigger.expected/Missing_android_sdk_hash.json
|
| +++ b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_android_sdk.json
|
| @@ -399,25 +399,76 @@
|
| "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]/swarming_temp_dir",
|
| + "511"
|
| + ],
|
| + "name": "makedirs swarming tmp dir (2)",
|
| + "~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/android_sdk_hash",
|
| - "/path/to/tmp/"
|
| + "{\n \"args\": [\n \"--isolate\", \n \"[BUILD]/scripts/slave/recipes/skia/gsutil.isolate\", \n \"--isolated\", \n \"[SLAVE_BUILD]/swarming_temp_dir/skia-task-isolate_gsutil.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_gsutil.isolated.gen.json"
|
| ],
|
| - "name": "Read android_sdk_hash",
|
| + "name": "Write isolate_gsutil.isolated.gen.json"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::isolate]/resources/isolate.py",
|
| + "[SLAVE_BUILD]/swarming.client",
|
| + "batcharchive",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--verbose",
|
| + "[SLAVE_BUILD]/swarming_temp_dir/isolate_gsutil.isolated.gen.json"
|
| + ],
|
| + "name": "isolate tests (2)",
|
| "~followup_annotations": [
|
| - "step returned non-zero exit code: 1",
|
| - "@@@STEP_EXCEPTION@@@"
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"isolate_gsutil\": \"[dummy hash for isolate_gsutil]\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@SET_BUILD_PROPERTY@swarm_hashes@{\"isolate_gsutil\": \"[dummy hash for isolate_gsutil]\"}@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/skia/infra/bots/android_sdk_hash",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "name": "Read android_sdk_hash"
|
| + },
|
| + {
|
| + "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]/swarming_temp_dir",
|
| "511"
|
| ],
|
| - "name": "makedirs swarming tmp dir (2)",
|
| + "name": "makedirs swarming tmp dir (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@python.inline@@@@",
|
| "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
| @@ -455,7 +506,7 @@
|
| "--verbose",
|
| "[SLAVE_BUILD]/swarming_temp_dir/compile_skia.isolated.gen.json"
|
| ],
|
| - "name": "isolate tests (2)",
|
| + "name": "isolate tests (3)",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"compile_skia\": \"[dummy hash for compile_skia]\"@@@",
|
|
|