| Index: infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
|
| diff --git a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
|
| similarity index 90%
|
| copy from infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
|
| copy to infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
|
| index a234e83778a794a5731b11a8c1b5980cb63358ba..49c8306c26f5ca4e696bc404d57a2e164afae360 100644
|
| --- a/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-x86_64-Release.json
|
| +++ b/infra/bots/recipes/swarm_trigger.expected/Build-Mac-Clang-Arm64-Release-Android.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport json\nimport sys\n\nwith open(sys.argv[1]) as f:\n content = json.load(f)\n\nprint json.dumps(content, indent=2)\n",
|
| - "{\"buildername\": \"Build-Mac-Clang-x86_64-Release\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| + "{\"buildername\": \"Build-Mac-Clang-Arm64-Release-Android\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
|
| ],
|
| "name": "print properties",
|
| "~followup_annotations": [
|
| @@ -261,6 +261,26 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/skia/infra/bots/assets/android_sdk/VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "name": "read android_sdk VERSION"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| + "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_darwin/VERSION",
|
| + "/path/to/tmp/"
|
| + ],
|
| + "name": "read android_ndk_darwin VERSION"
|
| + },
|
| + {
|
| + "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"
|
| @@ -327,7 +347,7 @@
|
| "--shards",
|
| "1",
|
| "--task-name",
|
| - "compile_skia/Mac/[dummy has/Build-Mac-Clang-x86_64-Release/5",
|
| + "compile_skia/Mac/[dummy has/Build-Mac-Clang-Arm64-Release-Android/5",
|
| "--dump-json",
|
| "/path/to/tmp/json",
|
| "--expiration",
|
| @@ -348,7 +368,7 @@
|
| "--tag",
|
| "allow_milo:1",
|
| "--tag",
|
| - "buildername:Build-Mac-Clang-x86_64-Release",
|
| + "buildername:Build-Mac-Clang-Arm64-Release-Android",
|
| "--tag",
|
| "buildnumber:5",
|
| "--tag",
|
| @@ -366,12 +386,16 @@
|
| "--tag",
|
| "stepname:compile_skia on Mac",
|
| "--idempotent",
|
| + "--cipd-package",
|
| + "android_sdk:skia/bots/android_sdk:version:0",
|
| + "--cipd-package",
|
| + "android_ndk_darwin:skia/bots/android_ndk_darwin:version:0",
|
| "[dummy hash for compile_skia]",
|
| "--",
|
| "--workdir",
|
| "../../..",
|
| "swarm_compile",
|
| - "buildername=Build-Mac-Clang-x86_64-Release",
|
| + "buildername=Build-Mac-Clang-Arm64-Release-Android",
|
| "mastername=client.skia.compile",
|
| "buildnumber=1",
|
| "slavename=skiabot-dummy-compile-slave",
|
| @@ -382,9 +406,9 @@
|
| "name": "[trigger] compile_skia on Mac",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Mac/[dummy has/Build-Mac-Clang-x86_64-Release/5\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"compile_skia/Mac/[dummy has/Build-Mac-Clang-Arm64-Release-Android/5\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Mac/[dummy has/Build-Mac-Clang-x86_64-Release/5\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"compile_skia/Mac/[dummy has/Build-Mac-Clang-Arm64-Release-Android/5\": {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| @@ -407,7 +431,7 @@
|
| "--decorate",
|
| "--print-status-updates",
|
| "--json",
|
| - "{\"base_task_name\": \"compile_skia/Mac/[dummy has/Build-Mac-Clang-x86_64-Release/5\", \"tasks\": {\"compile_skia/Mac/[dummy has/Build-Mac-Clang-x86_64-Release/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| + "{\"base_task_name\": \"compile_skia/Mac/[dummy has/Build-Mac-Clang-Arm64-Release-Android/5\", \"tasks\": {\"compile_skia/Mac/[dummy has/Build-Mac-Clang-Arm64-Release-Android/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
|
| "--task-summary-json",
|
| "/path/to/tmp/json"
|
| ],
|
|
|