[recipes] Update Catalyst cipd revision
This makes catalyst deliver zedboot via ipxe again. Without this, it's
harder to disable broadcasting packets in zedboot, so any potential
future change that has NUCs sit in the build's version of zedboot could
clog the network.
Change-Id: I12e4136f728d070f8f24fd01dd5b507c3265fe95
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 3b04dba..14cf557 100644
--- a/recipe_modules/build/examples/full.expected/extract_build_artifacts.json
+++ b/recipe_modules/build/examples/full.expected/extract_build_artifacts.json
@@ -3619,7 +3619,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -3648,7 +3648,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
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 bd8c890..b28b620 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
@@ -3615,7 +3615,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -3644,7 +3644,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
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 fca5da4..a33744e 100644
--- a/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
+++ b/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
@@ -1478,7 +1478,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -1829,7 +1829,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 28ffa6e..ac93a0f 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
@@ -1431,7 +1431,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-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 28d83f6..4327d06 100644
--- a/recipe_modules/testing/examples/full.expected/sharded_failure_string.json
+++ b/recipe_modules/testing/examples/full.expected/sharded_failure_string.json
@@ -1463,7 +1463,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -1804,7 +1804,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 dd8353b..2bbc04d 100644
--- a/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json
+++ b/recipe_modules/testing/examples/full.expected/sharded_kernel_panic.json
@@ -1463,7 +1463,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -1798,7 +1798,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 01538a3..fdd29b5 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
@@ -1977,7 +1977,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -2015,7 +2015,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -2053,7 +2053,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -2091,7 +2091,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -3015,7 +3015,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -3053,7 +3053,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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"
@@ -3091,7 +3091,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 2cdd7ae..215e5f5 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
@@ -1478,7 +1478,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}, {\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 94a01ed..c8aa165 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
@@ -1463,7 +1463,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 921d096..9ac84d6 100644
--- a/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
+++ b/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
@@ -1481,7 +1481,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"run\", \"-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 8f319f0..e59d593 100644
--- a/recipe_modules/testing_requests/api.py
+++ b/recipe_modules/testing_requests/api.py
@@ -29,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:12ba48e4eea05053e01e834502042a8c710bdc99"
class _TaskRequester(object):
diff --git a/recipes/fuchsia/build.expected/default.json b/recipes/fuchsia/build.expected/default.json
index a83fb35..4960982 100644
--- a/recipes/fuchsia/build.expected/default.json
+++ b/recipes/fuchsia/build.expected/default.json
@@ -2595,7 +2595,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -2628,7 +2628,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
diff --git a/recipes/fuchsia/build.expected/default_cq.json b/recipes/fuchsia/build.expected/default_cq.json
index af5ca64..c2508fa 100644
--- a/recipes/fuchsia/build.expected/default_cq.json
+++ b/recipes/fuchsia/build.expected/default_cq.json
@@ -2460,7 +2460,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -2493,7 +2493,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
diff --git a/recipes/fuchsia/build.expected/non-numeric-parent-id.json b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
index cfd2d48..d12a6d3 100644
--- a/recipes/fuchsia/build.expected/non-numeric-parent-id.json
+++ b/recipes/fuchsia/build.expected/non-numeric-parent-id.json
@@ -2559,7 +2559,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -2592,7 +2592,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
diff --git a/recipes/fuchsia/build.expected/spec_remote_cq.json b/recipes/fuchsia/build.expected/spec_remote_cq.json
index 367ad95..5c0f923 100644
--- a/recipes/fuchsia/build.expected/spec_remote_cq.json
+++ b/recipes/fuchsia/build.expected/spec_remote_cq.json
@@ -2482,7 +2482,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -2515,7 +2515,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
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 a10c8f2..c079a50 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
@@ -2482,7 +2482,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 \"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 \"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:12ba48e4eea05053e01e834502042a8c710bdc99\", \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 \"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 \"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,
@@ -2515,7 +2515,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:12ba48e4eea05053e01e834502042a8c710bdc99\", @@@",
"@@@STEP_LOG_LINE@task_requests.json@ \"package_name\": \"fuchsia/infra/catalyst/${platform}\"@@@",
"@@@STEP_LOG_LINE@task_requests.json@ }@@@",
"@@@STEP_LOG_LINE@task_requests.json@ ]@@@",
diff --git a/recipes/fuchsia_perf.expected/device_tests.json b/recipes/fuchsia_perf.expected/device_tests.json
index 4551b41..317779e 100644
--- a/recipes/fuchsia_perf.expected/device_tests.json
+++ b/recipes/fuchsia_perf.expected/device_tests.json
@@ -2036,7 +2036,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\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"command\": [\"./luci-auth\", \"context\", \"--\", \"./catalyst\", \"-images\", \"images.json\", \"-bootserver\", \"./bootserver_new\", \"-config\", \"/etc/catalyst/config.json\", \"./botanist\", \"-level\", \"debug\", \"zedboot\", \"-config\", \"/etc/botanist/config.json\", \"-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 3a7fd27..0b3977e 100644
--- a/recipes/zbi_test.expected/fail-arm64.json
+++ b/recipes/zbi_test.expected/fail-arm64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 f577ed2..0510e5e 100644
--- a/recipes/zbi_test.expected/fail-x64.json
+++ b/recipes/zbi_test.expected/fail-x64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 0f121bd..cabd080 100644
--- a/recipes/zbi_test.expected/flake-arm64.json
+++ b/recipes/zbi_test.expected/flake-arm64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 ce97413..5f86944 100644
--- a/recipes/zbi_test.expected/flake-x64.json
+++ b/recipes/zbi_test.expected/flake-x64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 74f0ec7..f9c6522 100644
--- a/recipes/zbi_test.expected/kernel_panic-arm64.json
+++ b/recipes/zbi_test.expected/kernel_panic-arm64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 31919dd..cd10738 100644
--- a/recipes/zbi_test.expected/kernel_panic-x64.json
+++ b/recipes/zbi_test.expected/kernel_panic-x64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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"
@@ -2506,7 +2506,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 6601fbc..b004a66 100644
--- a/recipes/zbi_test.expected/pass-arm64.json
+++ b/recipes/zbi_test.expected/pass-arm64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 cc06b08..afa5259 100644
--- a/recipes/zbi_test.expected/pass-x64.json
+++ b/recipes/zbi_test.expected/pass-x64.json
@@ -2161,7 +2161,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: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\": \"serial\", \"value\": \"1\"}, {\"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:12ba48e4eea05053e01e834502042a8c710bdc99\"}]}, \"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\": \"serial\", \"value\": \"1\"}, {\"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 85ce8e8..9604ba7 100644
--- a/recipes/zbi_test.py
+++ b/recipes/zbi_test.py
@@ -57,7 +57,7 @@
BOTANIST_LOG_LEVEL = 'debug'
# The version of catalyst to use.
-CATALYST_CIPD_REVISION = "git_revision:a4b37878529202f054930707c2f98c5ffe44e9f4"
+CATALYST_CIPD_REVISION = "git_revision:12ba48e4eea05053e01e834502042a8c710bdc99"
PROPERTIES = {
'manifest':
