[catalyst] Update catalyst version and config. Bump catalyst to support loading zedboot from build over ipxe. Also have catalyst use its own config file that diverges from botanist. Change-Id: Ib5e61ded5b173c83d107e860635d0c0b2271d07f

commit: a4a7f8d089c82a4a2fab21bc73c9fffdb862d673 [log] [tgz]
author: Anirudh Mathukumilli <rudymathu@google.com> Wed Jan 22 08:46:13 2020 +0000
committer: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> Wed Jan 22 08:46:13 2020 +0000
tree: b80d6218793e4b97e18b2c66099c364df90372b2
parent: 5b86bdea2ddcdeee887e96ce8d231a6d9a52464b [diff]
diff --git a/recipe_modules/build/examples/full.expected/extract_build_artifacts.json b/recipe_modules/build/examples/full.expected/extract_build_artifacts.json
index cb01144..41761c5 100644
--- a/recipe_modules/build/examples/full.expected/extract_build_artifacts.json
+++ b/recipe_modules/build/examples/full.expected/extract_build_artifacts.json

@@ -3548,7 +3548,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"0\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"syslog.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"0\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"DUMMY.POOL\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./catalyst\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-timeout\", \n            \"0s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-syslog\", \n            \"syslog.txt\", \n            \"-repo\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/uuid/repository\", \n            \"-blobs\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/blobs\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"-use-runtests\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"0\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"0\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"syslog.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"0\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"DUMMY.POOL\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./catalyst\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-timeout\", \n            \"0s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-syslog\", \n            \"syslog.txt\", \n            \"-repo\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/uuid/repository\", \n            \"-blobs\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/blobs\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"-use-runtests\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"0\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_3/task_requests.json"
     ],
     "infra_step": true,
@@ -3577,7 +3577,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"packages\": [@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -3601,7 +3601,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipe_modules/build/examples/full.expected/extract_build_artifacts_with_images.json b/recipe_modules/build/examples/full.expected/extract_build_artifacts_with_images.json
index 46bafa7..c231236 100644
--- a/recipe_modules/build/examples/full.expected/extract_build_artifacts_with_images.json
+++ b/recipe_modules/build/examples/full.expected/extract_build_artifacts_with_images.json

@@ -3544,7 +3544,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"0\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"syslog.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"0\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"DUMMY.POOL\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./catalyst\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-timeout\", \n            \"0s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-syslog\", \n            \"syslog.txt\", \n            \"-repo\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/uuid/repository\", \n            \"-blobs\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/blobs\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"-use-runtests\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"0\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"0\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"syslog.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"0\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"DUMMY.POOL\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./catalyst\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://###fuchsia-build###/uuid/images/images.json\", \n            \"-timeout\", \n            \"0s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-syslog\", \n            \"syslog.txt\", \n            \"-repo\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/uuid/repository\", \n            \"-blobs\", \n            \"http://$GCS_PROXY_HOST/###fuchsia-build###/blobs\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"-use-runtests\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"0\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_3/task_requests.json"
     ],
     "infra_step": true,
@@ -3573,7 +3573,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"packages\": [@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -3597,7 +3597,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipe_modules/testing/examples/full.expected/fail_then_timeout.json b/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
index 1033258..f82c32f 100644
--- a/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
+++ b/recipe_modules/testing/examples/full.expected/fail_then_timeout.json

@@ -1439,7 +1439,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1790,7 +1790,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/isolated_test_device_no_pave.json b/recipe_modules/testing/examples/full.expected/isolated_test_device_no_pave.json
index 0e03c51..a340a70 100644
--- a/recipe_modules/testing/examples/full.expected/isolated_test_device_no_pave.json
+++ b/recipe_modules/testing/examples/full.expected/isolated_test_device_no_pave.json

@@ -1351,7 +1351,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC6i3SYK-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"-serial-log\", \"serial.txt\", \"-netboot\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC6i3SYK\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"out.tar\", \"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC6i3SYK-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"-serial-log\", \"serial.txt\", \"-netboot\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC6i3SYK\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"out.tar\", \"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/sharded_failure_string.json b/recipe_modules/testing/examples/full.expected/sharded_failure_string.json
index a70bd83..115396c 100644
--- a/recipe_modules/testing/examples/full.expected/sharded_failure_string.json
+++ b/recipe_modules/testing/examples/full.expected/sharded_failure_string.json

@@ -1382,7 +1382,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1723,7 +1723,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json b/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json
index 25b05de..20bb6dd 100644
--- a/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json
+++ b/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json

@@ -1382,7 +1382,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1717,7 +1717,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/test_in_shards_mixed_failure.json b/recipe_modules/testing/examples/full.expected/test_in_shards_mixed_failure.json
index 0a14168..6f5213b 100644
--- a/recipe_modules/testing/examples/full.expected/test_in_shards_mixed_failure.json
+++ b/recipe_modules/testing/examples/full.expected/test_in_shards_mixed_failure.json

@@ -1737,7 +1737,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1775,7 +1775,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0001\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0001\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1813,7 +1813,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -1851,7 +1851,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0003\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0003\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2775,7 +2775,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0001\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0001\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2813,7 +2813,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2851,7 +2851,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"fuchsia-0003\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"fuchsia-0003\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:NUC-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"NUC\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"NUC\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/test_in_shards_single_attempt.json b/recipe_modules/testing/examples/full.expected/test_in_shards_single_attempt.json
index 0c1cd2c..ae5ea08 100644
--- a/recipe_modules/testing/examples/full.expected/test_in_shards_single_attempt.json
+++ b/recipe_modules/testing/examples/full.expected/test_in_shards_single_attempt.json

@@ -1439,7 +1439,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"multiplied:fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"multiplied:fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-per-test-timeout\", \"1s\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"QEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/test_with_shards_arm64_serial_failure.json b/recipe_modules/testing/examples/full.expected/test_with_shards_arm64_serial_failure.json
index 1f0e5a9..16561a8 100644
--- a/recipe_modules/testing/examples/full.expected/test_with_shards_arm64_serial_failure.json
+++ b/recipe_modules/testing/examples/full.expected/test_with_shards_arm64_serial_failure.json

@@ -1382,7 +1382,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Vim2\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:Khadas Vim2 Max-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Khadas Vim2 Max\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"FUCHSIA_DEVICE_TYPE\", \"value\": \"Khadas Vim2 Max\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing/examples/full.expected/upload_to_catapult.json b/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
index 12ac99e..c036851 100644
--- a/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
+++ b/recipe_modules/testing/examples/full.expected/upload_to_catapult.json

@@ -1400,7 +1400,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"Linux\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:linux-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"os\", \"value\": \"linux\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"Linux\", \"priority\": \"200\", \"service_account\": \"default_service_account\", \"tags\": [\"test_environment_name:linux-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"gs://fuchsia-artifacts/8945511751514863184/images/images.json\", \"-timeout\", \"0s\", \"-serial-log\", \"serial.txt\", \"-syslog\", \"syslog.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-config\", \"/etc/botanist/config.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"tests.json\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"os\", \"value\": \"linux\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"//products/foo.gni\"}, {\"key\": \"FUCHSIA_TEST_OUTDIR\", \"value\": \"${ISOLATED_OUTDIR}\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"LSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"BUILDBUCKET_BUCKET\", \"value\": \"ci\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"arm64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"fuchsia\"}, {\"key\": \"BUILDER_NAME\", \"value\": \"builder\"}, {\"key\": \"INPUT_COMMIT_REF\", \"value\": \"refs/heads/master\"}, {\"key\": \"INPUT_COMMIT_HOST\", \"value\": \"fuchsia.googlesource.com\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"//boards/foo.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build-type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"0\", \"grace_period_secs\": \"30\", \"idempotent\": false, \"inputs_ref\": {\"isolated\": \"[dummy hash]\", \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \"namespace\": \"default-gzip\"}, \"io_timeout_secs\": \"0\", \"outputs\": [\"serial.txt\", \"syslog.txt\", \"out.tar\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipe_modules/testing_requests/api.py b/recipe_modules/testing_requests/api.py
index 06d3ccc..5fdc958 100644
--- a/recipe_modules/testing_requests/api.py
+++ b/recipe_modules/testing_requests/api.py

@@ -10,6 +10,8 @@
 AUTHORIZED_KEY_PATH = 'data/ssh/authorized_keys'
 # The path to the botanist config on the host.
 BOTANIST_DEVICE_CONFIG = '/etc/botanist/config.json'
+# The path to the catalyst config on the host.
+CATALYST_DEVICE_CONFIG = '/etc/catalyst/config.json'
 # The log level to use for botanist invocations in test tasks. Can be one of
 # "fatal", "error", "warning", "info", "debug", or "trace", where "trace" is
 # the most verbose, and fatal is the least.
@@ -27,7 +29,7 @@
 _PRIVATE_KEY_PATH = 'private_key'
 
 # The version of catalyst to use.
-CATALYST_CIPD_REVISION = "git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc"
+CATALYST_CIPD_REVISION = "git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4"
 
 
 class _TaskRequester(object):
@@ -118,8 +120,8 @@
 
       if not is_emu_type:
         # If this test shard runs on physical devices, catalyst needs to be given
-        # the botanist device config.
-        cmd.extend(['-config', BOTANIST_DEVICE_CONFIG])
+        # a device config.
+        cmd.extend(['-config', CATALYST_DEVICE_CONFIG])
 
       botanist_cmd = [
           './botanist',
@@ -592,7 +594,7 @@
         '-bootserver',
         './bootserver_new',
         '-config',
-        BOTANIST_DEVICE_CONFIG,
+        CATALYST_DEVICE_CONFIG,
     ])
 
     # Construct the botanist command.

diff --git a/recipes/fuchsia/build.expected/default.json b/recipes/fuchsia/build.expected/default.json
index aaf8275..879d1a1 100644
--- a/recipes/fuchsia/build.expected/default.json
+++ b/recipes/fuchsia/build.expected/default.json

@@ -2522,7 +2522,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_4/task_requests.json"
     ],
     "infra_step": true,
@@ -2555,7 +2555,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@              }, @@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -2586,7 +2586,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipes/fuchsia/build.expected/default_cq.json b/recipes/fuchsia/build.expected/default_cq.json
index b56a60b..5cbbabc 100644
--- a/recipes/fuchsia/build.expected/default_cq.json
+++ b/recipes/fuchsia/build.expected/default_cq.json

@@ -2387,7 +2387,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_5/task_requests.json"
     ],
     "infra_step": true,
@@ -2420,7 +2420,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@              }, @@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -2451,7 +2451,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipes/fuchsia/build.expected/non-numeric-parent-id.json b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
index 7171b3a..9c5a096 100644
--- a/recipes/fuchsia/build.expected/non-numeric-parent-id.json
+++ b/recipes/fuchsia/build.expected/non-numeric-parent-id.json

@@ -2486,7 +2486,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/not-a-number/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/not-a-number/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/not-a-number/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/not-a-number/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"fuchsia.googlesource.com\", \n              \"key\": \"INPUT_COMMIT_HOST\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"ci\", \n              \"key\": \"BUILDBUCKET_BUCKET\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"fuchsia\", \n              \"key\": \"INPUT_COMMIT_PROJECT\"\n            }, \n            {\n              \"value\": \"builder\", \n              \"key\": \"BUILDER_NAME\"\n            }, \n            {\n              \"value\": \"refs/heads/master\", \n              \"key\": \"INPUT_COMMIT_REF\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"1527292217\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_4/task_requests.json"
     ],
     "infra_step": true,
@@ -2519,7 +2519,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@              }, @@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -2550,7 +2550,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipes/fuchsia/build.expected/spec_remote_cq.json b/recipes/fuchsia/build.expected/spec_remote_cq.json
index d9778a9..e3aa9f9 100644
--- a/recipes/fuchsia/build.expected/spec_remote_cq.json
+++ b/recipes/fuchsia/build.expected/spec_remote_cq.json

@@ -2409,7 +2409,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_5/task_requests.json"
     ],
     "infra_step": true,
@@ -2442,7 +2442,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@              }, @@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -2473,7 +2473,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json b/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json
index 7cb0d2a..c4d4ad8 100644
--- a/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json
+++ b/recipes/fuchsia/build.expected/spec_remote_cq_with_spec_revision.json

@@ -2409,7 +2409,7 @@
       "--json-output",
       "/path/to/tmp/json",
       "copy",
-      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
+      "[\n  {\n    \"priority\": \"200\", \n    \"task_slices\": [\n      {\n        \"expiration_secs\": \"600\", \n        \"properties\": {\n          \"outputs\": [\n            \"serial.txt\", \n            \"out.tar\"\n          ], \n          \"inputs_ref\": {\n            \"isolatedserver\": \"https://example.isolateserver.appspot.com\", \n            \"namespace\": \"default-gzip\", \n            \"isolated\": \"[dummy hash]\"\n          }, \n          \"io_timeout_secs\": \"300\", \n          \"cipd_input\": {\n            \"packages\": [\n              {\n                \"path\": \".\", \n                \"version\": \"latest\", \n                \"package_name\": \"infra/tools/luci-auth/${platform}\"\n              }, \n              {\n                \"path\": \".\", \n                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", \n                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"\n              }\n            ]\n          }, \n          \"grace_period_secs\": \"30\", \n          \"dimensions\": [\n            {\n              \"value\": \"1\", \n              \"key\": \"serial\"\n            }, \n            {\n              \"value\": \"fuchsia.tests\", \n              \"key\": \"pool\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"device_type\"\n            }\n          ], \n          \"idempotent\": false, \n          \"command\": [\n            \"./luci-auth\", \n            \"context\", \n            \"--\", \n            \"./catalyst\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-bootserver\", \n            \"./bootserver_new\", \n            \"-config\", \n            \"/etc/catalyst/config.json\", \n            \"./botanist\", \n            \"-level\", \n            \"debug\", \n            \"run\", \n            \"-images\", \n            \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \n            \"-timeout\", \n            \"1800s\", \n            \"-serial-log\", \n            \"serial.txt\", \n            \"-netboot\", \n            \"-config\", \n            \"/etc/botanist/config.json\", \n            \"./testrunner\", \n            \"-archive\", \n            \"out.tar\", \n            \"tests.json\"\n          ], \n          \"env\": [\n            {\n              \"value\": \"products/core.gni\", \n              \"key\": \"BUILD_PRODUCT\"\n            }, \n            {\n              \"value\": \"${ISOLATED_OUTDIR}\", \n              \"key\": \"FUCHSIA_TEST_OUTDIR\"\n            }, \n            {\n              \"value\": \"8945511751514863184\", \n              \"key\": \"BUILDBUCKET_ID\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"LSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"UBSAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"x64\", \n              \"key\": \"BUILD_TARGET\"\n            }, \n            {\n              \"value\": \"llvm-symbolizer\", \n              \"key\": \"ASAN_SYMBOLIZER_PATH\"\n            }, \n            {\n              \"value\": \"Khadas Vim2 Max\", \n              \"key\": \"FUCHSIA_DEVICE_TYPE\"\n            }, \n            {\n              \"value\": \"boards/x64.gni\", \n              \"key\": \"BUILD_BOARD\"\n            }, \n            {\n              \"value\": \"0\", \n              \"key\": \"BUILD_CREATE_TIME\"\n            }, \n            {\n              \"value\": \"debug\", \n              \"key\": \"BUILD_TYPE\"\n            }\n          ], \n          \"containment\": {\n            \"lower_priority\": false, \n            \"limit_processes\": \"0\", \n            \"containment_type\": \"NONE\", \n            \"limit_total_committed_memory\": \"0\"\n          }, \n          \"execution_timeout_secs\": \"1800\", \n          \"env_prefixes\": []\n        }\n      }\n    ], \n    \"name\": \"Vim2\", \n    \"service_account\": \"service_account\", \n    \"tags\": [\n      \"test_environment_name:Khadas Vim2 Max-x64\"\n    ]\n  }\n]",
       "[CLEANUP]/test-orchestration-inputs_tmp_5/task_requests.json"
     ],
     "infra_step": true,
@@ -2442,7 +2442,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@              }, @@@",
       "@@@STEP_LOG_LINE@task_requests.json@              {@@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"path\": \".\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@                \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@                \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
       "@@@STEP_LOG_LINE@task_requests.json@              }@@@",
       "@@@STEP_LOG_LINE@task_requests.json@            ]@@@",
@@ -2473,7 +2473,7 @@
       "@@@STEP_LOG_LINE@task_requests.json@            \"-bootserver\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./bootserver_new\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-config\", @@@",
-      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/botanist/config.json\", @@@",
+      "@@@STEP_LOG_LINE@task_requests.json@            \"/etc/catalyst/config.json\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"./botanist\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"-level\", @@@",
       "@@@STEP_LOG_LINE@task_requests.json@            \"debug\", @@@",

diff --git a/recipes/fuchsia_perf.expected/device_tests.json b/recipes/fuchsia_perf.expected/device_tests.json
index d1bfb08..a7c92df 100644
--- a/recipes/fuchsia_perf.expected/device_tests.json
+++ b/recipes/fuchsia_perf.expected/device_tests.json

@@ -2000,7 +2000,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"service_account\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"-serial-log\", \"serial.txt\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"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\": \"300\", \"outputs\": [\"out.tar\", \"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"all tests\", \"priority\": \"200\", \"service_account\": \"service_account\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"infra/tools/luci-auth/${platform}\", \"path\": \".\", \"version\": \"latest\"}, {\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-images\", \"gs://fuchsia-infra-artifacts/8945511751514863184/images/images.json\", \"-results-dir\", \"/tmp/infra-test-output\", \"-out\", \"out.tar\", \"-serial-log\", \"serial.txt\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"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\": \"300\", \"outputs\": [\"out.tar\", \"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/fail-arm64.json b/recipes/zbi_test.expected/fail-arm64.json
index 880a5cf..1b0aa50 100644
--- a/recipes/zbi_test.expected/fail-arm64.json
+++ b/recipes/zbi_test.expected/fail-arm64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/fail-x64.json b/recipes/zbi_test.expected/fail-x64.json
index 2a8246c..848ec5b 100644
--- a/recipes/zbi_test.expected/fail-x64.json
+++ b/recipes/zbi_test.expected/fail-x64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/flake-arm64.json b/recipes/zbi_test.expected/flake-arm64.json
index 0131fc5..dfd5f19 100644
--- a/recipes/zbi_test.expected/flake-arm64.json
+++ b/recipes/zbi_test.expected/flake-arm64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/flake-x64.json b/recipes/zbi_test.expected/flake-x64.json
index 04e404f..58580f3 100644
--- a/recipes/zbi_test.expected/flake-x64.json
+++ b/recipes/zbi_test.expected/flake-x64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/kernel_panic-arm64.json b/recipes/zbi_test.expected/kernel_panic-arm64.json
index 154414c..50d60d4 100644
--- a/recipes/zbi_test.expected/kernel_panic-arm64.json
+++ b/recipes/zbi_test.expected/kernel_panic-arm64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/kernel_panic-x64.json b/recipes/zbi_test.expected/kernel_panic-x64.json
index fb2cef2..3827c15 100644
--- a/recipes/zbi_test.expected/kernel_panic-x64.json
+++ b/recipes/zbi_test.expected/kernel_panic-x64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"
@@ -2507,7 +2507,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/pass-arm64.json b/recipes/zbi_test.expected/pass-arm64.json
index 2304593..fd9a2e0 100644
--- a/recipes/zbi_test.expected/pass-arm64.json
+++ b/recipes/zbi_test.expected/pass-arm64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-arm64 - Vim2\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Vim2-arm64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Vim2\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.expected/pass-x64.json b/recipes/zbi_test.expected/pass-x64.json
index d716d2f..14f053e 100644
--- a/recipes/zbi_test.expected/pass-x64.json
+++ b/recipes/zbi_test.expected/pass-x64.json

@@ -2162,7 +2162,7 @@
       "-server",
       "https://example.swarmingserver.appspot.com",
       "-json-input",
-      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/botanist/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
+      "{\"requests\": [{\"name\": \"zbi-test-x64 - Intel NUC Kit NUC7i5DNHE\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:Intel NUC Kit NUC7i5DNHE-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/infra/catalyst/${platform}\", \"path\": \".\", \"version\": \"git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4\"}]}, \"command\": [\"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-serial-log\", \"serial.txt\", \"-config\", \"/etc/botanist/config.json\", \"-netboot\", \"./seriallistener\", \"-timeout\", \"5m\", \"-stdout=True\", \"-success-str\", \"purple monkey dishwasher\"], \"containment\": {\"containment_type\": \"NONE\", \"limit_processes\": \"0\", \"limit_total_committed_memory\": \"0\", \"lower_priority\": false}, \"dimensions\": [{\"key\": \"pool\", \"value\": \"fuchsia.tests\"}, {\"key\": \"device_type\", \"value\": \"Intel NUC Kit NUC7i5DNHE\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"600\", \"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\": [\"serial.txt\"]}}]}]}",
       "-json-output",
       "/path/to/tmp/json",
       "-cancel-extra-tasks"

diff --git a/recipes/zbi_test.py b/recipes/zbi_test.py
index 32cb053..ec06492 100644
--- a/recipes/zbi_test.py
+++ b/recipes/zbi_test.py

@@ -47,6 +47,7 @@
 TEST_EXECUTION_TIMEOUT_SECS = 600
 
 BOTANIST_DEVICE_CONFIG = '/etc/botanist/config.json'
+CATALYST_DEVICE_CONFIG = '/etc/catalyst/config.json'
 IMAGES_JSON = 'images.json'
 QEMU_KERNEL_NAME = 'qemu-kernel'
 
@@ -56,7 +57,7 @@
 BOTANIST_LOG_LEVEL = 'debug'
 
 # The version of catalyst to use.
-CATALYST_CIPD_REVISION = "git_revision:ce2f15d1cbb756b968b4fa79f557976fc196fcbc"
+CATALYST_CIPD_REVISION = "git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4"
 
 PROPERTIES = {
     'manifest':
@@ -279,7 +280,7 @@
           './catalyst',
           '-images', IMAGES_JSON,
           '-bootserver', './bootserver_new',
-          '-config', config,
+          '-config', CATALYST_DEVICE_CONFIG,
         ])
 
       # Construct the botanist command
commit	a4a7f8d089c82a4a2fab21bc73c9fffdb862d673	[log] [tgz]
author	Anirudh Mathukumilli <rudymathu@google.com>	Wed Jan 22 08:46:13 2020 +0000
committer	CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>	Wed Jan 22 08:46:13 2020 +0000
tree	b80d6218793e4b97e18b2c66099c364df90372b2
parent	5b86bdea2ddcdeee887e96ce8d231a6d9a52464b [diff]