Revert "Add CIPD package support to swarming recipe api"

scripts/slave/recipes/v8.expected/full_client_v8_V8_Linux___gc_stress.json

 [
   {
     "cmd": [
       "python",
       "-u",
       "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
       "--path",
       "[SLAVE_BUILD]/swarming.client",
       "--url",
       "https://chromium.googlesource.com/external/swarming.client.git"
@@ skipping 71 matching lines @@
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "--version"
     ],
     "name": "swarming.py --version",
     "stdout": "/path/to/tmp/",
     "~followup_annotations": [
-      "@@@STEP_TEXT@0.8.6@@@"
+      "@@@STEP_TEXT@0.4.10@@@"
     ]
   },
   {
     "cmd": [
       "python",
       "-u",
       "[SLAVE_BUILD]/swarming.client/swarming.py",
       "trigger",
       "--swarming",
       "https://chromium-swarm.appspot.com",
@@ skipping 304 matching lines @@
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571\", \"tasks\": {\"Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571:3:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}, \"Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571:3:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"}, \"Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571:3:2\": {\"shard_index\": 2, \"task_id\": \"10200\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10200\"}}}"
+      "--shards",
+      "3",
+      "Mjsunit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
     "name": "Mjsunit",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@00:00:101 mjsunit/Cool.Test2@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Details:@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Test: mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@Flags: -f@@@",
@@ skipping 17 matching lines @@
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Webkit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571\", \"tasks\": {\"Webkit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}}}"
+      "--shards",
+      "1",
+      "Webkit/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
     "name": "Webkit",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@00:00:101 mjsunit/Cool.Test2@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Details:@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Test: mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@Flags: -f@@@",
@@ skipping 17 matching lines @@
       "--temp-root-dir",
       "[TMP_BASE]",
       "--merged-test-output",
       "/path/to/tmp/json",
       "--",
       "collect",
       "--swarming",
       "https://chromium-swarm.appspot.com",
       "--decorate",
       "--print-status-updates",
-      "--json",
-      "{\"base_task_name\": \"Mjsunit - ignition - turbofan/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571\", \"tasks\": {\"Mjsunit - ignition - turbofan/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571:2:0\": {\"shard_index\": 0, \"task_id\": \"10000\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"}, \"Mjsunit - ignition - turbofan/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571:2:1\": {\"shard_index\": 1, \"task_id\": \"10100\", \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"}}}"
+      "--shards",
+      "2",
+      "Mjsunit - ignition - turbofan/Ubuntu-12.04/[dummy has/V8 Linux - gc stress/571"
     ],
     "name": "Mjsunit - ignition - turbofan",
     "~followup_annotations": [
       "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@00:00:101 mjsunit/Cool.Test2@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Details:@@@",
       "@@@STEP_LOG_LINE@durations@@@@",
       "@@@STEP_LOG_LINE@durations@Test: mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@Flags: -f@@@",
       "@@@STEP_LOG_LINE@durations@Command: d8 -f mjsunit/Cool.Test@@@",
       "@@@STEP_LOG_LINE@durations@Duration: 01:01:002@@@",
       "@@@STEP_LOG_LINE@durations@Test: mjsunit/Cool.Test2@@@",
       "@@@STEP_LOG_LINE@durations@Flags: -f -g@@@",
       "@@@STEP_LOG_LINE@durations@Command: d8 -f mjsunit/Cool.Test2@@@",
       "@@@STEP_LOG_LINE@durations@Duration: 00:00:101@@@",
       "@@@STEP_LOG_END@durations@@@"
     ]
   },
   {
     "name": "$result",
     "recipe_result": null,
     "status_code": 0
   }
 ]