preserve GN_Android in compile -> test mapper

infra/bots/recipes/swarm_trigger.expected/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android.json

 [
   {
     "cmd": [
       "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\": \"Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
+      "{\"buildername\": \"Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android\", \"buildnumber\": 5, \"mastername\": \"client.skia\", \"path_config\": \"kitchen\", \"recipe\": \"swarm_trigger\", \"revision\": \"abc123\", \"slavename\": \"skiabot-linux-swarm-000\"}"
     ],
     "name": "print properties",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import json@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@with open(sys.argv[1]) as f:@@@",
       "@@@STEP_LOG_LINE@python.inline@  content = json.load(f)@@@",
       "@@@STEP_LOG_LINE@python.inline@@@@",
@@ skipping 256 matching lines @@
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/android_ndk_linux/VERSION",
       "/path/to/tmp/"
     ],
     "name": "read android_ndk_linux VERSION"
   },
   {
     "cmd": [
       "python",
       "-u",
+      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
+      "[SLAVE_BUILD]/skia/infra/bots/assets/clang_linux/VERSION",
+      "/path/to/tmp/"
+    ],
+    "name": "read clang_linux 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"
     ],
     "name": "makedirs swarming 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])@@@",
@@ skipping 46 matching lines @@
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "90",
       "--shards",
       "1",
       "--task-name",
-      "compile_skia/Ubuntu/[dummy has/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5",
+      "compile_skia/Ubuntu/[dummy has/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "72000",
       "--io-timeout",
       "2400",
       "--hard-timeout",
       "14400",
       "--dimension",
       "gpu",
       "none",
       "--dimension",
       "os",
       "Ubuntu",
       "--dimension",
       "pool",
       "Skia",
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan",
+      "buildername:Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
       "--tag",
       "buildnumber:5",
       "--tag",
       "data:[dummy hash for compile_skia]",
       "--tag",
       "master:client.skia",
       "--tag",
       "name:compile_skia",
       "--tag",
       "os:Ubuntu",
       "--tag",
       "revision:abc123",
       "--tag",
       "slavename:skiabot-linux-swarm-000",
       "--tag",
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
       "--cipd-package",
       "android_sdk:skia/bots/android_sdk:version:0",
       "--cipd-package",
       "android_ndk_linux:skia/bots/android_ndk_linux:version:0",
+      "--cipd-package",
+      "clang_linux:skia/bots/clang_linux:version:0",
       "[dummy hash for compile_skia]",
       "--",
       "--workdir",
       "../../..",
       "swarm_compile",
-      "buildername=Build-Ubuntu-GCC-Arm64-Debug-Android_Vulkan",
+      "buildername=Build-Ubuntu-Clang-arm-Debug-GN_Android",
       "mastername=client.skia.compile",
       "buildnumber=1",
       "slavename=skiabot-dummy-compile-slave",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=abc123"
     ],
     "name": "[trigger] compile_skia on Ubuntu",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Ubuntu/[dummy has/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"compile_skia/Ubuntu/[dummy has/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_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\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
       "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"compile_skia/Ubuntu/[dummy has/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5\", \"tasks\": {\"compile_skia/Ubuntu/[dummy has/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_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"
     ],
     "name": "compile_skia on Ubuntu",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
       "@@@STEP_LOG_LINE@json.output@    {@@@",
       "@@@STEP_LOG_LINE@json.output@      \"abandoned_ts\": null, @@@",
@@ skipping 165 matching lines @@
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--isolate-server",
       "https://isolateserver.appspot.com",
       "--priority",
       "90",
       "--shards",
       "1",
       "--task-name",
-      "test_skia/Android/def456/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5",
+      "test_skia/Android/def456/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5",
       "--dump-json",
       "/path/to/tmp/json",
       "--expiration",
       "72000",
       "--io-timeout",
       "2400",
       "--hard-timeout",
       "14400",
       "--dimension",
       "device_type",
-      "foster",
+      "sprout",
       "--dimension",
       "os",
       "Android",
       "--dimension",
       "pool",
       "Skia",
       "--tag",
       "allow_milo:1",
       "--tag",
-      "buildername:Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan",
+      "buildername:Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
       "--tag",
       "buildnumber:5",
       "--tag",
       "data:def456",
       "--tag",
       "master:client.skia",
       "--tag",
       "name:test_skia",
       "--tag",
       "os:Android",
       "--tag",
       "revision:abc123",
       "--tag",
       "slavename:skiabot-linux-swarm-000",
       "--tag",
       "stepname:test_skia on Android",
       "--cipd-package",
       "skp:skia/bots/skp:version:0",
       "--cipd-package",
       "skimage:skia/bots/skimage:version:0",
       "--cipd-package",
       "svg:skia/bots/svg:version:0",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "swarm_test",
-      "buildername=Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan",
+      "buildername=Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
       "mastername=client.skia",
       "buildnumber=5",
       "slavename=skiabot-linux-swarm-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=abc123"
     ],
     "name": "[trigger] test_skia on Android",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test_skia/Android/def456/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\", @@@",
+      "@@@STEP_LOG_LINE@json.output@  \"base_task_name\": \"test_skia/Android/def456/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5\", @@@",
       "@@@STEP_LOG_LINE@json.output@  \"tasks\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"test_skia/Android/def456/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\": {@@@",
+      "@@@STEP_LOG_LINE@json.output@    \"test_skia/Android/def456/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_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\"@@@",
       "@@@STEP_LOG_LINE@json.output@    }@@@",
       "@@@STEP_LOG_LINE@json.output@  }@@@",
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
       "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/10000@@@"
     ]
@@ skipping 24 matching lines @@
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
       "--json",
-      "{\"base_task_name\": \"test_skia/Android/def456/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\", \"tasks\": {\"test_skia/Android/def456/Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan/5\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}",
+      "{\"base_task_name\": \"test_skia/Android/def456/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android/5\", \"tasks\": {\"test_skia/Android/def456/Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_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",
       "--task-output-dir",
       "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia"
     ],
     "name": "test_skia on Android",
     "~followup_annotations": [
       "@@@STEP_TEXT@swarming pending 71s@@@",
       "@@@STEP_LOG_LINE@json.output@{@@@",
       "@@@STEP_LOG_LINE@json.output@  \"shards\": [@@@",
@@ skipping 70 matching lines @@
     ],
     "name": "dm_dir"
   },
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[skia::core]/resources/upload_dm_results.py",
       "[SLAVE_BUILD]/dm",
       "abc123",
-      "Test-Android-GCC-NVIDIA_Shield-GPU-TegraX1-Arm64-Debug-Vulkan",
+      "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-GN_Android",
       "5",
       "",
       "[SLAVE_BUILD]/skia/common/py/utils"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
     "env": {
       "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
     "name": "Upload DM Results"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]