[Skia] Convert Sk Images to a CIPD package

scripts/slave/recipes/skia/swarm_trigger.expected/legacy_skimage_version.json

Index: scripts/slave/recipes/skia/swarm_trigger.expected/legacy_skimage_version.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_skimage_version.json
similarity index 98%
copy from scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json
copy to scripts/slave/recipes/skia/swarm_trigger.expected/legacy_skimage_version.json
index f2a6176a4c311b8cbc662480b0ff8725ff8be266..e8b33055fc40463c14ebfa40c32a93e628d78a22 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/No_downloaded_SKP_VERSION.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/legacy_skimage_version.json
@@ -576,7 +576,7 @@
       "--tag",
       "os:Ubuntu",
       "--tag",
-      "slavename:skiabot-linux-test-000",
+      "slavename:skiabot-linux-compile-000",
       "--tag",
       "stepname:compile_skia on Ubuntu",
       "--idempotent",
@@ -698,7 +698,27 @@
       "[SLAVE_BUILD]/tmp/SKP_VERSION",
       "/path/to/tmp/"
     ],
-    "name": "Get downloaded SKP_VERSION",
+    "name": "Get downloaded 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]/tmp/SK_IMAGE_VERSION",
+      "/path/to/tmp/"
+    ],
+    "name": "Get downloaded SK_IMAGE_VERSION",
     "~followup_annotations": [
       "step returned non-zero exit code: 1",
       "@@@STEP_EXCEPTION@@@"
@@ -709,19 +729,19 @@
       "python",
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/SKP_VERSION",
+      "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
       "/path/to/tmp/"
     ],
-    "name": "Get expected SKP_VERSION"
+    "name": "Get expected SK_IMAGE_VERSION"
   },
   {
     "cmd": [
       "python",
       "-u",
       "\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]/skps"
+      "[SLAVE_BUILD]/images"
     ],
-    "name": "rmtree skps",
+    "name": "rmtree images",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
@@ -738,10 +758,10 @@
       "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]/skps",
+      "[SLAVE_BUILD]/images",
       "511"
     ],
-    "name": "makedirs skps",
+    "name": "makedirs images",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@python.inline@@@@",
       "@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
@@ -765,14 +785,14 @@
       "----",
       "cp",
       "-R",
-      "gs://chromium-skia-gm/playback_42/skps/*",
-      "[SLAVE_BUILD]/skps"
+      "gs://chromium-skia-gm/skimage/v42/*",
+      "[SLAVE_BUILD]/images"
     ],
     "env": {
       "AWS_CREDENTIAL_FILE": "[HOME]/chromium-skia-gm.boto",
       "BOTO_CONFIG": "[HOME]/chromium-skia-gm.boto"
     },
-    "name": "gsutil download skps"
+    "name": "gsutil download images"
   },
   {
     "cmd": [
@@ -780,29 +800,9 @@
       "-u",
       "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
       "42",
-      "[SLAVE_BUILD]/tmp/SKP_VERSION"
-    ],
-    "name": "write SKP_VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION",
-      "/path/to/tmp/"
+      "[SLAVE_BUILD]/tmp/SK_IMAGE_VERSION"
     ],
-    "name": "Get downloaded SK_IMAGE_VERSION"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[SLAVE_BUILD]/skia/SK_IMAGE_VERSION",
-      "/path/to/tmp/"
-    ],
-    "name": "Get expected SK_IMAGE_VERSION"
+    "name": "write SK_IMAGE_VERSION"
   },
   {
     "cmd": [
@@ -946,7 +946,7 @@
       "--tag",
       "os:Ubuntu",
       "--tag",
-      "slavename:skiabot-linux-test-000",
+      "slavename:skiabot-linux-compile-000",
       "--tag",
       "stepname:test_skia on Ubuntu",
       "def456",
@@ -957,7 +957,7 @@
       "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
       "mastername=client.skia",
       "buildnumber=5",
-      "slavename=skiabot-linux-test-000",
+      "slavename=skiabot-linux-compile-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=164710"
@@ -1120,7 +1120,7 @@
       "--tag",
       "os:Ubuntu",
       "--tag",
-      "slavename:skiabot-linux-test-000",
+      "slavename:skiabot-linux-compile-000",
       "--tag",
       "stepname:perf_skia on Ubuntu",
       "def456",
@@ -1131,7 +1131,7 @@
       "buildername=Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug",
       "mastername=client.skia",
       "buildnumber=5",
-      "slavename=skiabot-linux-test-000",
+      "slavename=skiabot-linux-compile-000",
       "reason=Triggered by Skia swarm_trigger Recipe",
       "swarm_out_dir=${ISOLATED_OUTDIR}",
       "revision=164710"