Clean up more old recipe expectations

A follow-up to I25a61943caae3d215575084c45ec54f1115f6946; these are a
few old expectation files that I missed.

Change-Id: I7f0491591b242b3682c38b8bfba48ad97ad03210
diff --git a/recipes/fuchsia/test.expected/basic.json b/recipes/fuchsia/test.expected/basic.json
deleted file mode 100644
index 5d9d7f9..0000000
--- a/recipes/fuchsia/test.expected/basic.json
+++ /dev/null
@@ -1,913 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "download build artifacts"
-  },
-  {
-    "cmd": [],
-    "name": "download build artifacts.ensure isolated",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/isolated_client",
-      "-ensure-file",
-      "infra/tools/luci/isolated/${platform} git_revision:4520b945a32ae72645adf048ff86bfdc87ac9810",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "download build artifacts.ensure isolated.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:452\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/isolated/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/isolated_client/isolated",
-      "download",
-      "-verbose",
-      "-isolate-server",
-      "https://example.isolateserver.appspot.com",
-      "-isolated",
-      "abc",
-      "-output-dir",
-      "[CLEANUP]/build-artifacts_tmp_1"
-    ],
-    "infra_step": true,
-    "name": "download build artifacts.download build_artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CLEANUP]/build-artifacts_tmp_1/args.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "download build artifacts.read args.json",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"build_type\": \"release\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"target\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"variants\": []@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CLEANUP]/build-artifacts_tmp_1/images.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "download build artifacts.read images.json",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"netboot\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_netboot\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--boot\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"netboot\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"netboot.zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"zircon-a\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[CLEANUP]/build-artifacts_tmp_1/shards.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "download build artifacts.load test shards",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"environment\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"device_type\": \"QEMU\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"QEMU\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"name\": \"test0\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"path\": \"/path/to/test0\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"environment\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"dimensions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"device_type\": \"NUC\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"NUC\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"tests\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"name\": \"test1\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"path\": \"/path/to/test1\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "shard QEMU"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"name\": \"test0\", \n    \"os\": \"fuchsia\", \n    \"path\": \"/path/to/test0\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_2/tests.json"
-    ],
-    "infra_step": true,
-    "name": "shard QEMU.write test manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tests.json@[@@@",
-      "@@@STEP_LOG_LINE@tests.json@  {@@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"name\": \"test0\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"os\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"path\": \"/path/to/test0\"@@@",
-      "@@@STEP_LOG_LINE@tests.json@  }@@@",
-      "@@@STEP_LOG_LINE@tests.json@]@@@",
-      "@@@STEP_LOG_END@tests.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"cpu\": 4, \n    \"kvm\": true, \n    \"memory\": 4096, \n    \"path\": \"./qemu/bin\", \n    \"target\": \"x64\", \n    \"type\": \"qemu\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_2/qemu.json"
-    ],
-    "infra_step": true,
-    "name": "shard QEMU.write qemu config",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@qemu.json@[@@@",
-      "@@@STEP_LOG_LINE@qemu.json@  {@@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"cpu\": 4, @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"kvm\": true, @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"memory\": 4096, @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"path\": \"./qemu/bin\", @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"target\": \"x64\", @@@",
-      "@@@STEP_LOG_LINE@qemu.json@    \"type\": \"qemu\"@@@",
-      "@@@STEP_LOG_LINE@qemu.json@  }@@@",
-      "@@@STEP_LOG_LINE@qemu.json@]@@@",
-      "@@@STEP_LOG_END@qemu.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"bootserver_netboot\": [\n      \"--boot\"\n    ], \n    \"name\": \"netboot\", \n    \"path\": \"netboot.zbi\", \n    \"type\": \"zbi\"\n  }, \n  {\n    \"bootserver_pave\": [\n      \"--boot\", \n      \"--zircona\"\n    ], \n    \"name\": \"zircon-a\", \n    \"path\": \"fuchsia.zbi\", \n    \"type\": \"zbi\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_2/images.json"
-    ],
-    "infra_step": true,
-    "name": "shard QEMU.write image manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@images.json@[@@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_netboot\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ], @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"netboot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"netboot.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ], @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }@@@",
-      "@@@STEP_LOG_LINE@images.json@]@@@",
-      "@@@STEP_LOG_END@images.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
-      "--link-json",
-      "{\"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi\": [\"[CLEANUP]/isolate_tmp_2/fuchsia.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/netboot.zbi\": [\"[CLEANUP]/isolate_tmp_2/netboot.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_2/pkey\"]}"
-    ],
-    "infra_step": true,
-    "name": "shard QEMU.create tree of build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/isolated_client/isolated",
-      "archive",
-      "-verbose",
-      "-isolate-server",
-      "https://example.isolateserver.appspot.com",
-      "-namespace",
-      "default-gzip",
-      "-dump-hash",
-      "/path/to/tmp/",
-      "-dirs",
-      "[CLEANUP]/isolate_tmp_2:."
-    ],
-    "infra_step": true,
-    "name": "shard QEMU.isolate build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@isolated UI@https://example.isolateserver.appspot.com/browse?namespace=default-gzip&hash=%5Bdummy+hash%5D@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "shard NUC"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"name\": \"test1\", \n    \"os\": \"linux\", \n    \"path\": \"/path/to/test1\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_3/tests.json"
-    ],
-    "infra_step": true,
-    "name": "shard NUC.write test manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@tests.json@[@@@",
-      "@@@STEP_LOG_LINE@tests.json@  {@@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"name\": \"test1\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"os\": \"linux\", @@@",
-      "@@@STEP_LOG_LINE@tests.json@    \"path\": \"/path/to/test1\"@@@",
-      "@@@STEP_LOG_LINE@tests.json@  }@@@",
-      "@@@STEP_LOG_LINE@tests.json@]@@@",
-      "@@@STEP_LOG_END@tests.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"bootserver_netboot\": [\n      \"--boot\"\n    ], \n    \"name\": \"netboot\", \n    \"path\": \"netboot.zbi\", \n    \"type\": \"zbi\"\n  }, \n  {\n    \"bootserver_pave\": [\n      \"--boot\", \n      \"--zircona\"\n    ], \n    \"name\": \"zircon-a\", \n    \"path\": \"fuchsia.zbi\", \n    \"type\": \"zbi\"\n  }\n]",
-      "[CLEANUP]/isolate_tmp_3/images.json"
-    ],
-    "infra_step": true,
-    "name": "shard NUC.write image manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@images.json@[@@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_netboot\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ], @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"netboot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"netboot.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }, @@@",
-      "@@@STEP_LOG_LINE@images.json@  {@@@",
-      "@@@STEP_LOG_LINE@images.json@    \"bootserver_pave\": [@@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--boot\", @@@",
-      "@@@STEP_LOG_LINE@images.json@      \"--zircona\"@@@",
-      "@@@STEP_LOG_LINE@images.json@    ], @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"name\": \"zircon-a\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"path\": \"fuchsia.zbi\", @@@",
-      "@@@STEP_LOG_LINE@images.json@    \"type\": \"zbi\"@@@",
-      "@@@STEP_LOG_LINE@images.json@  }@@@",
-      "@@@STEP_LOG_LINE@images.json@]@@@",
-      "@@@STEP_LOG_END@images.json@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
-      "--link-json",
-      "{\"/path/to/test1\": [\"/path/to/test1\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/netboot.zbi\": [\"[CLEANUP]/isolate_tmp_3/netboot.zbi\"]}"
-    ],
-    "infra_step": true,
-    "name": "shard NUC.create tree of build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/isolated_client/isolated",
-      "archive",
-      "-verbose",
-      "-isolate-server",
-      "https://example.isolateserver.appspot.com",
-      "-namespace",
-      "default-gzip",
-      "-dump-hash",
-      "/path/to/tmp/",
-      "-dirs",
-      "[CLEANUP]/isolate_tmp_3:."
-    ],
-    "infra_step": true,
-    "name": "shard NUC.isolate build artifacts",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@isolated UI@https://example.isolateserver.appspot.com/browse?namespace=default-gzip&hash=%5Bdummy+hash%5D@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure swarming"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/swarming_client",
-      "-ensure-file",
-      "infra/tools/luci/swarming/${platform} git_revision:fd7d55c05dac7486ba163c0d08827a0901afaa7b",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure swarming.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:fd7\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/swarming/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/swarming_client/swarming",
-      "spawn-tasks",
-      "-server",
-      "https://example.swarmingserver.appspot.com",
-      "-json-input",
-<<<<<<< HEAD:recipes/fuchsia/test.expected/basic.json
-<<<<<<< HEAD
-      "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/tools/botanist/linux-amd64\", \"path\": \".\", \"version\": \"git_revision:fdebd6c09c707f0af8d9758724765ad5dc3fc037\"}, {\"package_name\": \"fuchsia/qemu/linux-amd64\", \"path\": \"qemu\", \"version\": \"git_revision:0f0027d617976b4cbb7b937d5836f8ef0ac25ba1\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"output.fs\"]}}]}, {\"name\": \"NUC\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/tools/botanist/linux-amd64\", \"path\": \".\", \"version\": \"git_revision:fdebd6c09c707f0af8d9758724765ad5dc3fc037\"}, {\"package_name\": \"fuchsia/tools/testrunner/linux-amd64\", \"path\": \".\", \"version\": \"git_revision:fdebd6c09c707f0af8d9758724765ad5dc3fc037\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"images.json\", \"-timeout\", \"2400s\", \"-syslog\", \"syslog.txt\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
-=======
-      "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/tools/botanist/${platform}\", \"path\": \".\", \"version\": \"git_revision:a113e7193c6131cd0eb4710ed57ac0c228d14ed7\"}, {\"package_name\": \"fuchsia/tools/testrunner/${platform}\", \"path\": \".\", \"version\": \"git_revision:da83f868dbe2b5d114ac874621c860ae2cba3c82\"}, {\"package_name\": \"fuchsia/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"latest\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"2400s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"pkey\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}, {\"name\": \"NUC\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/tools/botanist/${platform}\", \"path\": \".\", \"version\": \"git_revision:a113e7193c6131cd0eb4710ed57ac0c228d14ed7\"}, {\"package_name\": \"fuchsia/tools/testrunner/${platform}\", \"path\": \".\", \"version\": \"git_revision:da83f868dbe2b5d114ac874621c860ae2cba3c82\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"2400s\", \"-syslog\", \"syslog.txt\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
->>>>>>> ceb52273... [testing] Move QEMU over to SSH workflow
-=======
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/tools/botanist/${platform}\", \"path\": \".\", \"version\": \"git_revision:652b0acfd634aea432eb2432dcc8ea5a37dccc3b\"}, {\"package_name\": \"fuchsia/tools/testrunner/${platform}\", \"path\": \".\", \"version\": \"git_revision:652b0acfd634aea432eb2432dcc8ea5a37dccc3b\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"2400s\", \"-syslog\", \"syslog.txt\", \"-config\", \"/etc/botanist/config.json\", \"-serial-log\", \"serial.txt\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": 0, \"limit_total_committed_memory\": 0, \"lower_priority\": false}, \"dimensions\": [{\"key\": \"serial\", \"value\": \"1\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"2400\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"180\", \"outputs\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}]}]}",
->>>>>>> [recipes-py] Roll recipe engine.:recipe_modules/testing/examples/full.expected/with_experiment_serial_log.json
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "trigger 2 tasks",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"tasks\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"request\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"name\": \"QEMU\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"0\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }, @@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"request\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"name\": \"NUC\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"1\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LINK@Swarming task UI: QEMU@https://example.swarmingserver.appspot.com/task?id=0@@@",
-      "@@@STEP_LINK@Swarming task UI: NUC@https://example.swarmingserver.appspot.com/task?id=1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CACHE]/swarming_client/swarming",
-      "collect",
-      "-server",
-      "https://example.swarmingserver.appspot.com",
-      "-task-summary-json",
-      "/path/to/tmp/json",
-      "-task-output-stdout",
-      "json",
-      "-output-dir",
-      "[CLEANUP]/swarming_tmp_4",
-      "0",
-      "1"
-    ],
-    "infra_step": true,
-    "name": "collect",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"610\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"output\": \"hello world!\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"outputs\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"out.tar\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"testrunner-stdout.txt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"testrunner-stderr.txt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"results\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"duration\": 62.35, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"exit_code\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"QEMU\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"outputs_ref\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"namespace\": \"default-gzip\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"state\": \"COMPLETED\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"610\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"710\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"output\": \"hello world!\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"outputs\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"out.tar\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"testrunner-stdout.txt\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"testrunner-stderr.txt\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"results\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"duration\": 62.35, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"exit_code\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"name\": \"NUC\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"outputs_ref\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolated\": \"abc123\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"isolatedserver\": \"https://isolateserver.appspot.com\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"namespace\": \"default-gzip\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"state\": \"COMPLETED\", @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"task_id\": \"710\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_LINE@Swarming task output: QEMU@hello world!@@@",
-      "@@@STEP_LOG_END@Swarming task output: QEMU@@@",
-      "@@@STEP_LOG_LINE@Swarming task output: NUC@hello world!@@@",
-      "@@@STEP_LOG_END@Swarming task output: NUC@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "QEMU test results",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@symbolized logs@blah@@@",
-      "@@@STEP_LOG_LINE@symbolized logs@blah@@@",
-      "@@@STEP_LOG_END@symbolized logs@@@",
-      "@@@STEP_LOG_LINE@kernel log@hello world!@@@",
-      "@@@STEP_LOG_END@kernel log@@@",
-      "@@@STEP_LOG_LINE@testrunner-stdout.txt@extra log contents@@@",
-      "@@@STEP_LOG_END@testrunner-stdout.txt@@@",
-      "@@@STEP_LOG_LINE@testrunner-stderr.txt@extra log contents@@@",
-      "@@@STEP_LOG_END@testrunner-stderr.txt@@@",
-      "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"name\": \"/hello\", \"output_file\": \"hello.out\", \"result\": \"PASS\"}, {\"name\": \"benchmark.catapult_json\", \"output_file\": \"benchmark.catapult_json\", \"result\": \"PASS\"}]}@@@",
-      "@@@STEP_LOG_END@summary.json@@@",
-      "@@@STEP_LOG_LINE@goodbye-txt@goodbye@@@",
-      "@@@STEP_LOG_END@goodbye-txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CLEANUP]/build-artifacts_tmp_1/symbolize_tool",
-      "-ids",
-      "[CLEANUP]/build-artifacts_tmp_1/ids.txt",
-      "-llvm-symbolizer",
-      "[CLEANUP]/build-artifacts_tmp_1/llvm_symbolizer",
-      "-json-output",
-      "[CLEANUP]/symbolizer-output.json"
-    ],
-    "infra_step": true,
-    "name": "QEMU test results.symbolize logs",
-    "stdin": "hello world!",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "QEMU test results.ensure bsdtar",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/bsdtar",
-      "-ensure-file",
-      "fuchsia/tools/bsdtar/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "QEMU test results.ensure bsdtar.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/bsdtar/bsdtar",
-      "--extract",
-      "--verbose",
-      "-f",
-      "[CLEANUP]/swarming_tmp_4/610/out.tar",
-      "-C",
-      "[CLEANUP]/test_results/610"
-    ],
-    "name": "QEMU test results.extract",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/swarming_tmp_4/610/testrunner-stdout.txt",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "QEMU test results.read testrunner-stdout.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/swarming_tmp_4/610/testrunner-stderr.txt",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "QEMU test results.read testrunner-stderr.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "QEMU test results.all passed tests",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "QEMU test results.all passed tests./hello",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@stdio@hello@@@",
-      "@@@STEP_LOG_END@stdio@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "QEMU test results.all passed tests.benchmark.catapult_json",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@stdio@[\"dummy_catapult_data\"]@@@",
-      "@@@STEP_LOG_END@stdio@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "NUC test results",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@symbolized logs@blah@@@",
-      "@@@STEP_LOG_LINE@symbolized logs@blah@@@",
-      "@@@STEP_LOG_END@symbolized logs@@@",
-      "@@@STEP_LOG_LINE@kernel log@hello world!@@@",
-      "@@@STEP_LOG_END@kernel log@@@",
-      "@@@STEP_LOG_LINE@testrunner-stdout.txt@extra log contents@@@",
-      "@@@STEP_LOG_END@testrunner-stdout.txt@@@",
-      "@@@STEP_LOG_LINE@testrunner-stderr.txt@extra log contents@@@",
-      "@@@STEP_LOG_END@testrunner-stderr.txt@@@",
-      "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"name\": \"/hello\", \"output_file\": \"hello.out\", \"result\": \"PASS\"}, {\"name\": \"benchmark.catapult_json\", \"output_file\": \"benchmark.catapult_json\", \"result\": \"PASS\"}]}@@@",
-      "@@@STEP_LOG_END@summary.json@@@",
-      "@@@STEP_LOG_LINE@goodbye-txt@goodbye@@@",
-      "@@@STEP_LOG_END@goodbye-txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[CLEANUP]/build-artifacts_tmp_1/symbolize_tool",
-      "-ids",
-      "[CLEANUP]/build-artifacts_tmp_1/ids.txt",
-      "-llvm-symbolizer",
-      "[CLEANUP]/build-artifacts_tmp_1/llvm_symbolizer",
-      "-json-output",
-      "[CLEANUP]/symbolizer-output.json"
-    ],
-    "infra_step": true,
-    "name": "NUC test results.symbolize logs",
-    "stdin": "hello world!",
-    "stdout": "/path/to/tmp/",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/bsdtar/bsdtar",
-      "--extract",
-      "--verbose",
-      "-f",
-      "[CLEANUP]/swarming_tmp_4/710/out.tar",
-      "-C",
-      "[CLEANUP]/test_results/710"
-    ],
-    "name": "NUC test results.extract",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/swarming_tmp_4/710/testrunner-stdout.txt",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "NUC test results.read testrunner-stdout.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/swarming_tmp_4/710/testrunner-stderr.txt",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "NUC test results.read testrunner-stderr.txt",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "NUC test results.all passed tests",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "NUC test results.all passed tests./hello",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@stdio@hello@@@",
-      "@@@STEP_LOG_END@stdio@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "NUC test results.all passed tests.benchmark.catapult_json",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@stdio@[\"dummy_catapult_data\"]@@@",
-      "@@@STEP_LOG_END@stdio@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "upload QEMU test results"
-  },
-  {
-    "cmd": [],
-    "name": "upload QEMU test results.ensure_gsutil",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gsutil",
-      "-ensure-file",
-      "infra/tools/gsutil latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "upload QEMU test results.ensure_gsutil.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/gsutil\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::gsutil]/resources/gsutil.vpython",
-      "-u",
-      "[START_DIR]/cipd/gsutil/gsutil",
-      "-o",
-      "GSUtil:software_update_check_period=0",
-      "cp",
-      "[CLEANUP]/swarming_tmp_4/610/testrunner-stdout.txt",
-      "gs://fuchsia-infra/builds/8945511751514863184/QEMU/testrunner-stdout.txt"
-    ],
-    "infra_step": true,
-    "name": "upload QEMU test results.upload testrunner-stdout.txt to fuchsia-infra",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@testrunner-stdout.txt@https://storage.cloud.google.com/fuchsia-infra/builds/8945511751514863184/QEMU/testrunner-stdout.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::gsutil]/resources/gsutil.vpython",
-      "-u",
-      "[START_DIR]/cipd/gsutil/gsutil",
-      "-o",
-      "GSUtil:software_update_check_period=0",
-      "cp",
-      "[CLEANUP]/swarming_tmp_4/610/testrunner-stderr.txt",
-      "gs://fuchsia-infra/builds/8945511751514863184/QEMU/testrunner-stderr.txt"
-    ],
-    "infra_step": true,
-    "name": "upload QEMU test results.upload testrunner-stderr.txt to fuchsia-infra",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@testrunner-stderr.txt@https://storage.cloud.google.com/fuchsia-infra/builds/8945511751514863184/QEMU/testrunner-stderr.txt@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "upload NUC test results"
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::gsutil]/resources/gsutil.vpython",
-      "-u",
-      "[START_DIR]/cipd/gsutil/gsutil",
-      "-o",
-      "GSUtil:software_update_check_period=0",
-      "cp",
-      "[CLEANUP]/swarming_tmp_4/710/testrunner-stdout.txt",
-      "gs://fuchsia-infra/builds/8945511751514863184/NUC/testrunner-stdout.txt"
-    ],
-    "infra_step": true,
-    "name": "upload NUC test results.upload testrunner-stdout.txt to fuchsia-infra",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@testrunner-stdout.txt@https://storage.cloud.google.com/fuchsia-infra/builds/8945511751514863184/NUC/testrunner-stdout.txt@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::gsutil]/resources/gsutil.vpython",
-      "-u",
-      "[START_DIR]/cipd/gsutil/gsutil",
-      "-o",
-      "GSUtil:software_update_check_period=0",
-      "cp",
-      "[CLEANUP]/swarming_tmp_4/710/testrunner-stderr.txt",
-      "gs://fuchsia-infra/builds/8945511751514863184/NUC/testrunner-stderr.txt"
-    ],
-    "infra_step": true,
-    "name": "upload NUC test results.upload testrunner-stderr.txt to fuchsia-infra",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LINK@testrunner-stderr.txt@https://storage.cloud.google.com/fuchsia-infra/builds/8945511751514863184/NUC/testrunner-stderr.txt@@@"
-    ]
-  },
-  {
-    "jsonResult": null,
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/dart.json b/recipes/tricium/format.expected/dart.json
deleted file mode 100644
index cb6c02d..0000000
--- a/recipes/tricium/format.expected/dart.json
+++ /dev/null
@@ -1,311 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "fuchsia/dart-sdk/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/dart-sdk/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "DartFmt /path/to/file.dart"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/bin/dartfmt",
-      "-w",
-      "/path/to/file.dart"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "DartFmt /path/to/file.dart.formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "--name-only"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "DartFmt /path/to/file.dart.check formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": []}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/formatter_not_run.json b/recipes/tricium/format.expected/formatter_not_run.json
deleted file mode 100644
index 8a6f738..0000000
--- a/recipes/tricium/format.expected/formatter_not_run.json
+++ /dev/null
@@ -1,283 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "gn/gn/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"gn/gn/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": []}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/go.json b/recipes/tricium/format.expected/go.json
deleted file mode 100644
index 2bd2d2a..0000000
--- a/recipes/tricium/format.expected/go.json
+++ /dev/null
@@ -1,312 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "fuchsia/go/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/go/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "GoFmt /path/to/file.go"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/bin/gofmt",
-      "-s",
-      "-w",
-      "/path/to/file.go"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "GoFmt /path/to/file.go.formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "--name-only"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "GoFmt /path/to/file.go.check formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": []}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/no_formatters.json b/recipes/tricium/format.expected/no_formatters.json
deleted file mode 100644
index 37b9274..0000000
--- a/recipes/tricium/format.expected/no_formatters.json
+++ /dev/null
@@ -1,276 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {}@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": []}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/rust.json b/recipes/tricium/format.expected/rust.json
deleted file mode 100644
index 76e25b7..0000000
--- a/recipes/tricium/format.expected/rust.json
+++ /dev/null
@@ -1,322 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "fuchsia/rust/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/rust/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "RustFmt path/to/lib.rs"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/bin/rustfmt",
-      "path/to/lib.rs"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "RustFmt path/to/lib.rs.formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "--name-only"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "RustFmt path/to/lib.rs.check formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "reset",
-      "--hard"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "RustFmt path/to/lib.rs.reset",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": [{\\\"category\\\": \\\"Format/RustFmt\\\", \\\"end_char\\\": 0, \\\"end_line\\\": 0, \\\"message\\\": \\\"File not formatted properly.\\\\nRun the following to format, where <GN target> is the target containing path/to/lib.rs:\\\\nfx rustfmt <GN target>\\\", \\\"path\\\": \\\"path/to/lib.rs\\\", \\\"start_char\\\": 0, \\\"start_line\\\": 0, \\\"suggestion\\\": [], \\\"url\\\": \\\"\\\"}]}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/format.expected/star.json b/recipes/tricium/format.expected/star.json
deleted file mode 100644
index 596d36a..0000000
--- a/recipes/tricium/format.expected/star.json
+++ /dev/null
@@ -1,311 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure jiri"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-shared"
-    ],
-    "infra_step": true,
-    "name": "jiri init"
-  },
-  {
-    "cmd": [],
-    "name": "ensure_gerrit"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "get change details",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "flower",
-      "https://fuchsia.googlesource.com/integration"
-    ],
-    "infra_step": true,
-    "name": "jiri import"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "jiri patch"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "jiri update (2)"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ensure_packages"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd",
-      "-ensure-file",
-      "infra/tools/yapf latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_packages.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/yapf\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "fuchsia"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/fuchsia\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "YAPF /path/to/file.star"
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/yapf",
-      "--in-place",
-      "/path/to/file.star"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "YAPF /path/to/file.star.formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "--name-only"
-    ],
-    "cwd": "[START_DIR]/path/to/fuchsia",
-    "name": "YAPF /path/to/file.star.check formatting",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": []}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file
diff --git a/recipes/tricium/lint.expected/fuchsia.json b/recipes/tricium/lint.expected/fuchsia.json
deleted file mode 100644
index 0828b86..0000000
--- a/recipes/tricium/lint.expected/fuchsia.json
+++ /dev/null
@@ -1,820 +0,0 @@
-[
-  {
-    "cmd": [],
-    "name": "ensure_goma"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CACHE]/goma/client",
-      "-ensure-file",
-      "infra_internal/goma/client/${platform} release",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "ensure_goma.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra_internal/goma/client/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout"
-  },
-  {
-    "cmd": [],
-    "name": "checkout.ensure jiri",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/jiri",
-      "-ensure-file",
-      "fuchsia/tools/jiri/${platform} git_revision:95f7024e4df2cb3e5457b84397125bc19aaf04f8",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "checkout.ensure jiri.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-git_revision:95f\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/tools/jiri/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "init",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-analytics-opt=false",
-      "-rewrite-sso-to-https=true",
-      "-cache",
-      "[CACHE]/git",
-      "-partial"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri init",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "checkout.ensure_gerrit",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[START_DIR]/cipd/gerrit",
-      "-ensure-file",
-      "infra/tools/luci/gerrit/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "checkout.ensure_gerrit.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"infra/tools/luci/gerrit/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/gerrit/gerrit",
-      "change-detail",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-input",
-      "{\"change_id\": \"fuchsia~123456\", \"params\": {\"o\": [\"CURRENT_REVISION\"]}}",
-      "-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "checkout.get change details",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"branch\": \"master\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"current_revision\": \"a1b2c3\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"revisions\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"a1b2c3\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"ref\": \"refs/changes/00/100/5\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "import",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-name",
-      "integration",
-      "-remote-branch",
-      "master",
-      "stem",
-      "https://fuchsia.googlesource.com/fuchsia"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri import",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri update",
-    "timeout": 2400,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "patch",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-host",
-      "https://fuchsia-review.googlesource.com",
-      "-project",
-      "fuchsia",
-      "-rebase=true",
-      "refs/changes/00/100/5"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri patch",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "update",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-autoupdate=false",
-      "-attempts=3",
-      "-gc=true",
-      "-rebase-tracked",
-      "-local-manifest=true",
-      "-run-hooks=false",
-      "-fetch-packages=false"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri update (2)",
-    "timeout": 2400,
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "run-hooks",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-attempts=3",
-      "-local-manifest=true"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri run-hooks",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "fetch-packages",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-attempts=3",
-      "-local-manifest=true"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri fetch-packages",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "source-manifest",
-      "-vv",
-      "-time",
-      "-j=50",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri source-manifest",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@{@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  \"directories\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    \"manifest\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      \"git_checkout\": {@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"repo_url\": \"https://fuchsia.googlesource.com/manifest\", @@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@        \"revision\": \"4c2b0da3c06341db5cebe4d02c78c93c3b2bd78b\"@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@      }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@    }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@  }@@@",
-      "@@@STEP_LOG_LINE@json.output[source manifest]@}@@@",
-      "@@@STEP_LOG_END@json.output[source manifest]@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "snapshot",
-      "-vv",
-      "-time",
-      "-j=50",
-      "[CLEANUP]/jiri.snapshot"
-    ],
-    "infra_step": true,
-    "name": "checkout.jiri snapshot",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[CLEANUP]/jiri.snapshot",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "checkout.read snapshot",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@snapshot_contents@@@@",
-      "@@@STEP_LOG_END@snapshot_contents@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/prebuilt/third_party/gn/linux-x64/gn",
-      "gen",
-      "[START_DIR]/out/default",
-      "--check",
-      "--args=import(\"//products/core.gni\")  base_package_labels+=[\"//bundles/buildbot:core\"] gocache_dir=\"[CACHE]/go\" goma_dir=\"[CACHE]/goma/client\" is_debug=false select_variant=[\"clang\"] target_cpu=\"x64\" use_goma=true",
-      "--export-compile-commands"
-    ],
-    "name": "gn gen"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default/zircon.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read zircon ninja instructions",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"dir\": \"../default.zircon\", @@@",
-      "@@@STEP_LOG_LINE@json.output@  \"targets\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"legacy-host_tests\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"manifest-$cpu\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default.zircon/generated_sources.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "read zircon generated sources",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"//generated_header.h\"@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/out/default/all_fidl_json.txt",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "read generated sources"
-  },
-  {
-    "cmd": [],
-    "name": "ninja"
-  },
-  {
-    "cmd": [],
-    "name": "ninja.pre_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "<LUCI_CONTEXT>",
-      "/path/to/tmp/json"
-    ],
-    "name": "ninja.pre_goma.read context",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "{\"local_auth\": {\"accounts\": [{\"email\": \"some@example.com\", \"id\": \"test\"}], \"default_account_id\": \"system\"}}",
-      "[CLEANUP]/luci_context._tmp_1"
-    ],
-    "infra_step": true,
-    "name": "ninja.pre_goma.write context",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@luci_context._tmp_1@{\"local_auth\": {\"accounts\": [{\"email\": \"some@example.com\", \"id\": \"test\"}], \"default_account_id\": \"system\"}}@@@",
-      "@@@STEP_LOG_END@luci_context._tmp_1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "restart"
-    ],
-    "env": {
-      "GOMA_CACHE_DIR": "[CACHE]/goma",
-      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
-      "LUCI_CONTEXT": "[CLEANUP]/luci_context._tmp_1"
-    },
-    "infra_step": true,
-    "name": "ninja.pre_goma.start_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[infra::ninja]/resources/ninja_wrapper.py",
-      "--ninja_info_output",
-      "/path/to/tmp/json",
-      "--failure_output",
-      "/path/to/tmp/",
-      "--",
-      "[START_DIR]/prebuilt/third_party/ninja/linux-x64/ninja",
-      "-C",
-      "[START_DIR]/out/default.zircon",
-      "-j",
-      "20",
-      "//generated_header.h"
-    ],
-    "name": "ninja.zircon",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[infra::ninja]/resources/ninja_wrapper.py",
-      "--ninja_info_output",
-      "/path/to/tmp/json",
-      "--failure_output",
-      "/path/to/tmp/",
-      "--",
-      "[START_DIR]/prebuilt/third_party/ninja/linux-x64/ninja",
-      "-C",
-      "[START_DIR]/out/default",
-      "-j",
-      "20",
-      "//generated_fidl.json"
-    ],
-    "name": "ninja.fuchsia",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "ninja.post_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "jsonstatus",
-      "[CACHE]/goma/client/jsonstatus"
-    ],
-    "env": {
-      "GOMA_CACHE_DIR": "[CACHE]/goma",
-      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
-      "LUCI_CONTEXT": "[CLEANUP]/luci_context._tmp_1"
-    },
-    "name": "ninja.post_goma.goma_jsonstatus",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"notice\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"infra_status\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"num_user_error\": 0, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"ping_status_code\": 200@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stat"
-    ],
-    "env": {
-      "GOMA_CACHE_DIR": "[CACHE]/goma",
-      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
-      "LUCI_CONTEXT": "[CLEANUP]/luci_context._tmp_1"
-    },
-    "name": "ninja.post_goma.goma_stat",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "[CACHE]/goma/client/goma_ctl.py",
-      "stop"
-    ],
-    "env": {
-      "GOMA_CACHE_DIR": "[CACHE]/goma",
-      "GOMA_DEPS_CACHE_FILE": "goma_deps_cache",
-      "LUCI_CONTEXT": "[CLEANUP]/luci_context._tmp_1"
-    },
-    "name": "ninja.post_goma.stop_goma",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "merge compdbs"
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default.zircon/compile_commands.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "merge compdbs.read zircon compdb",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"command\": \"clang++ zircon.cpp\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"directory\": \"out/default.zircon\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"file\": \"zircon.cpp\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_END@json.output (invalid)@@@",
-      "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
-      "@@@STEP_LOG_END@json.output (exception)@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
-      "[START_DIR]/out/default/compile_commands.json",
-      "/path/to/tmp/json"
-    ],
-    "name": "merge compdbs.read compdb",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"command\": \"clang++ foo.cpp\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"directory\": \"out/default\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"file\": \"foo.cpp\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }, @@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"command\": \"clang++ third_party/foo.cpp\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"directory\": \"out/default\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"file\": \"third_party/foo.cpp\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@",
-      "@@@STEP_LOG_END@json.output (invalid)@@@",
-      "@@@STEP_LOG_LINE@json.output (exception)@No JSON object could be decoded@@@",
-      "@@@STEP_LOG_END@json.output (exception)@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[\n  {\n    \"command\": \"clang++ zircon.cpp\", \n    \"directory\": \"out/default.zircon\", \n    \"file\": \"zircon.cpp\"\n  }, \n  {\n    \"command\": \"clang++ foo.cpp\", \n    \"directory\": \"out/default\", \n    \"file\": \"foo.cpp\"\n  }\n]",
-      "[CLEANUP]/compile_commands.json"
-    ],
-    "infra_step": true,
-    "name": "write merged compdb",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@compile_commands.json@[@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@  {@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"command\": \"clang++ zircon.cpp\", @@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"directory\": \"out/default.zircon\", @@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"file\": \"zircon.cpp\"@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@  }, @@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@  {@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"command\": \"clang++ foo.cpp\", @@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"directory\": \"out/default\", @@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@    \"file\": \"foo.cpp\"@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@  }@@@",
-      "@@@STEP_LOG_LINE@compile_commands.json@]@@@",
-      "@@@STEP_LOG_END@compile_commands.json@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "clang-tidy"
-  },
-  {
-    "cmd": [
-      "cipd",
-      "ensure",
-      "-root",
-      "[CLEANUP]/cipd/clang-tidy",
-      "-ensure-file",
-      "fuchsia/clang/${platform} goma\ngn/gn/${platform} latest",
-      "-json-output",
-      "/path/to/tmp/json"
-    ],
-    "infra_step": true,
-    "name": "clang-tidy.ensure_installed",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"result\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-goma------------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"fuchsia/clang/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"package\": \"gn/gn/resolved-platform\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }@@@",
-      "@@@STEP_LOG_LINE@json.output@    ]@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [],
-    "name": "clang-tidy.run clang-tidy",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff",
-      "-U0",
-      "--no-color",
-      "HEAD^"
-    ],
-    "name": "clang-tidy.run clang-tidy.get changed files",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::clang_tidy]/resources/clang-tidy.vpython",
-      "-u",
-      "[CLEANUP]/cipd/clang-tidy/share/clang/clang-tidy-diff.py",
-      "-p1",
-      "-path",
-      "[CLEANUP]/compile_commands.json",
-      "-export-fixes",
-      "[CLEANUP]/clang_tidy_fixes.yaml",
-      "-clang-tidy-binary",
-      "[CLEANUP]/cipd/clang-tidy/bin/clang-tidy"
-    ],
-    "name": "clang-tidy.run clang-tidy.clang-tidy-diff.py",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "vpython",
-      "-vpython-spec",
-      "RECIPE_MODULE[infra::clang_tidy]/resources/clang-tidy.vpython",
-      "-u",
-      "RECIPE_MODULE[infra::clang_tidy]/resources/parse_yaml.py",
-      "[CLEANUP]/clang_tidy_fixes.yaml"
-    ],
-    "name": "clang-tidy.run clang-tidy.load yaml",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@2@@@",
-      "@@@STEP_LOG_LINE@json.output@{@@@",
-      "@@@STEP_LOG_LINE@json.output@  \"Diagnostics\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@    {@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"DiagnosticMessage\": {@@@",
-      "@@@STEP_LOG_LINE@json.output@        \"FileOffset\": 12, @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"FilePath\": \"path/to/file\", @@@",
-      "@@@STEP_LOG_LINE@json.output@        \"Message\": \"error\"@@@",
-      "@@@STEP_LOG_LINE@json.output@      }, @@@",
-      "@@@STEP_LOG_LINE@json.output@      \"DiagnosticName\": \"fuchsia-default\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    }@@@",
-      "@@@STEP_LOG_LINE@json.output@  ]@@@",
-      "@@@STEP_LOG_LINE@json.output@}@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "python",
-      "-u",
-      "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
-      "--json-output",
-      "/path/to/tmp/json",
-      "copy",
-      "[START_DIR]/out/default/path/to/file",
-      "/path/to/tmp/"
-    ],
-    "infra_step": true,
-    "name": "clang-tidy.read [START_DIR]/out/default/path/to/file",
-    "~followup_annotations": [
-      "@@@STEP_NEST_LEVEL@1@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "[START_DIR]/cipd/jiri/jiri",
-      "project",
-      "-vv",
-      "-time",
-      "-j=50",
-      "-json-output",
-      "/path/to/tmp/json",
-      "integration"
-    ],
-    "name": "jiri project",
-    "~followup_annotations": [
-      "@@@STEP_LOG_LINE@json.output@[@@@",
-      "@@@STEP_LOG_LINE@json.output@  {@@@",
-      "@@@STEP_LOG_LINE@json.output@    \"branches\": [@@@",
-      "@@@STEP_LOG_LINE@json.output@      \"(HEAD detached at c22471f)\"@@@",
-      "@@@STEP_LOG_LINE@json.output@    ], @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"current_branch\": \"\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"name\": \"integration\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"path\": \"path/to/integration\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"remote\": \"https://fuchsia.googlesource.com/integration\", @@@",
-      "@@@STEP_LOG_LINE@json.output@    \"revision\": \"c22471f4e3f842ae18dd9adec82ed9eb78ed1127\"@@@",
-      "@@@STEP_LOG_LINE@json.output@  }@@@",
-      "@@@STEP_LOG_LINE@json.output@]@@@",
-      "@@@STEP_LOG_END@json.output@@@"
-    ]
-  },
-  {
-    "cmd": [
-      "git",
-      "diff-tree",
-      "--no-commit-id",
-      "--name-only",
-      "--diff-filter=d",
-      "-r",
-      "HEAD"
-    ],
-    "cwd": "[START_DIR]/path/to/integration",
-    "name": "get changed files"
-  },
-  {
-    "cmd": [],
-    "name": "write results",
-    "~followup_annotations": [
-      "@@@SET_BUILD_PROPERTY@tricium@\"{\\\"comments\\\": [{\\\"category\\\": \\\"Lint/ClangTidy_fuchsia-default\\\", \\\"end_char\\\": 5, \\\"end_line\\\": 3, \\\"message\\\": \\\"fuchsia-default: error\\\", \\\"path\\\": \\\"../path/to/file\\\", \\\"start_char\\\": 5, \\\"start_line\\\": 3, \\\"suggestion\\\": [], \\\"url\\\": \\\"\\\"}]}\"@@@"
-    ]
-  },
-  {
-    "name": "$result"
-  }
-]
\ No newline at end of file