[Skia] Convert SKPs to a CIPD package

scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json

 [
   {
     "cmd": [
       "git",
       "remote",
       "set-url",
       "origin",
       "https://skia.googlesource.com/skia.git"
     ],
     "cwd": "[SLAVE_BUILD]/skia",
@@ skipping 661 matching lines @@
       "@@@STEP_LOG_LINE@json.output@}@@@",
       "@@@STEP_LOG_END@json.output@@@",
       "@@@STEP_LINK@shard #0 isolated out@blah@@@",
       "@@@STEP_LINK@view steps on Milo@https://luci-milo.appspot.com/swarming/task/148aa78d7aa0000@@@"
     ]
   },
   {
     "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]/tmp",
-      "511"
-    ],
-    "name": "makedirs 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])@@@",
-      "@@@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]/tmp/SKP_VERSION",
+      "[SLAVE_BUILD]/skia/infra/bots/assets/skp/VERSION",
       "/path/to/tmp/"
     ],
-    "name": "Get downloaded SKP_VERSION"
+    "name": "read skp VERSION"
   },
   {
     "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/SKP_VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "Get expected SKP_VERSION"
-  },
-  {
-    "cmd": [
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "[SLAVE_BUILD]/skia/infra/bots/assets/skimage/VERSION",
       "/path/to/tmp/"
     ],
     "name": "read skimage VERSION"
   },
   {
     "cmd": [
@@ skipping 136 matching lines @@
       "master:client.skia",
       "--tag",
       "name:test_skia",
       "--tag",
       "os:Mac",
       "--tag",
       "slavename:skiabot-linux-swarm-000",
       "--tag",
       "stepname:test_skia on Mac",
       "--cipd-package",
+      "skp:skia/bots/skp:version:0",
+      "--cipd-package",
       "skimage:skia/bots/skimage:version:0",
       "def456",
       "--",
       "--workdir",
       "../../..",
       "skia/swarm_test",
       "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
       "mastername=client.skia",
       "buildnumber=5",
       "slavename=skiabot-linux-swarm-000",
@@ skipping 147 matching lines @@
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
     "name": "Upload DM Results"
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]