[testing] make SSH'ing into QEMU a default
This effectively enables QEMU + SSH for the x64 sharded codepath;
the arm builders expressly set experimental.ssh_into_qemu as false for
the time being.
Bug: 9946
Change-Id: If57aaf9a66ef648b99a2314423ef10738f2430a8
diff --git a/recipe_modules/experimental/__init__.py b/recipe_modules/experimental/__init__.py
index 30bf72c..2ede0fb 100644
--- a/recipe_modules/experimental/__init__.py
+++ b/recipe_modules/experimental/__init__.py
@@ -17,7 +17,7 @@
help='Enables QEMU testing over SSH',
param_name='ssh_into_qemu',
kind=bool,
- default=False,
+ default=True,
),
'experimental.upload_test_outputs':
Property(
diff --git a/recipe_modules/testing/examples/full.expected/aemu.json b/recipe_modules/testing/examples/full.expected/aemu.json
index b2c5f59..1c57ae1 100644
--- a/recipe_modules/testing/examples/full.expected/aemu.json
+++ b/recipe_modules/testing/examples/full.expected/aemu.json
@@ -307,58 +307,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-AEMU"
- ],
- "infra_step": true,
- "name": "shard AEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-AEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-AEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-AEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-AEMU"
- ],
- "infra_step": true,
- "name": "shard AEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-AEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-AEMU@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-AEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-AEMU"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard AEMU.create zbi",
"~followup_annotations": [
@@ -367,13 +321,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard AEMU.create test image",
+ "infra_step": true,
+ "name": "shard AEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./aemu/bin\", \n \"type\": \"aemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard AEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./aemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"aemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -411,7 +418,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-AEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-AEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard AEMU.create tree of build artifacts",
@@ -509,7 +516,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"AEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:AEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/aemu/${platform}\", \"path\": \"aemu/bin\", \"version\": \"git_revision:058240c99e7a1b0782798a2e536f2be75b5f08cf\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"aemu\", \"-qemu-dir\", \"./aemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"AEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:AEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/aemu/${platform}\", \"path\": \"aemu/bin\", \"version\": \"git_revision:058240c99e7a1b0782798a2e536f2be75b5f08cf\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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\": \"AEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"boards/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -645,11 +652,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.AEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.AEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/0/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/0"
],
"infra_step": true,
@@ -744,14 +788,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -842,14 +884,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -874,7 +914,7 @@
"name": "passes.AEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -946,14 +986,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/0/summary.json"
],
"infra_step": true,
"name": "upload AEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.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 bc84656..70ee852 100644
--- a/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
+++ b/recipe_modules/testing/examples/full.expected/fail_then_timeout.json
@@ -307,58 +307,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0000.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0000@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0000@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0000.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-fuchsia-0000",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-fuchsia-0000"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard fuchsia-0000.create zbi",
"~followup_annotations": [
@@ -367,13 +321,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard fuchsia-0000.create test image",
+ "infra_step": true,
+ "name": "shard fuchsia-0000.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard fuchsia-0000.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -411,7 +418,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard fuchsia-0000.create tree of build artifacts",
@@ -509,7 +516,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -645,11 +652,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.fuchsia-0000.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.fuchsia-0000.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -745,14 +789,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -774,7 +816,7 @@
},
{
"cmd": [],
- "name": "launch/collect.0.failed tasks.fuchsia-0000 (attempt 0).failed: fuchsia-pkg://fuchsia.com/hello",
+ "name": "launch/collect.0.failed tasks.fuchsia-0000 (attempt 0).failed: /path/to/hello",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@stdio@hello@@@",
@@ -783,7 +825,7 @@
},
{
"cmd": [],
- "name": "launch/collect.0.failed tasks.fuchsia-0000 (attempt 0).failed: fuchsia-pkg://fuchsia.com/goodbye",
+ "name": "launch/collect.0.failed tasks.fuchsia-0000 (attempt 0).failed: /path/to/goodbye",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@stdio@goodbye@@@",
@@ -866,7 +908,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -1109,14 +1151,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -1139,7 +1179,7 @@
},
{
"cmd": [],
- "name": "failures.fuchsia-0000.attempt 0 (fail).failed: fuchsia-pkg://fuchsia.com/hello",
+ "name": "failures.fuchsia-0000.attempt 0 (fail).failed: /path/to/hello",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@stdio@hello@@@",
@@ -1149,7 +1189,7 @@
},
{
"cmd": [],
- "name": "failures.fuchsia-0000.attempt 0 (fail).failed: fuchsia-pkg://fuchsia.com/goodbye",
+ "name": "failures.fuchsia-0000.attempt 0 (fail).failed: /path/to/goodbye",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@stdio@goodbye@@@",
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 e551267..ec35867 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
@@ -433,58 +433,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0000.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0000@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0000@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0000.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0000@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-fuchsia-0000",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-fuchsia-0000"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard fuchsia-0000.create zbi",
"~followup_annotations": [
@@ -493,13 +447,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard fuchsia-0000.create test image",
+ "infra_step": true,
+ "name": "shard fuchsia-0000.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard fuchsia-0000.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -537,7 +544,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard fuchsia-0000.create tree of build artifacts",
@@ -675,58 +682,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-fuchsia-0002"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0002.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0002@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-fuchsia-0002@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-fuchsia-0002@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-fuchsia-0002"
- ],
- "infra_step": true,
- "name": "shard fuchsia-0002.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-fuchsia-0002@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-fuchsia-0002@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0002.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-fuchsia-0002",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-fuchsia-0002"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard fuchsia-0002.create zbi",
"~followup_annotations": [
@@ -735,13 +696,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_5/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_5/tests.json"
],
- "name": "shard fuchsia-0002.create test image",
+ "infra_step": true,
+ "name": "shard fuchsia-0002.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_5/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard fuchsia-0002.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -779,7 +793,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_5/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0002.zbi\": [\"[CLEANUP]/isolate_tmp_5/fuchsia-fuchsia-0002.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_5/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_5/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_5/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_5/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-fuchsia-0002.zbi\": [\"[CLEANUP]/isolate_tmp_5/fuchsia-fuchsia-0002.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_5/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_5/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_5/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_5/testrunner\"]}"
],
"infra_step": true,
"name": "shard fuchsia-0002.create tree of build artifacts",
@@ -980,7 +994,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -1056,7 +1070,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -1304,11 +1318,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.fuchsia-0000.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.fuchsia-0000.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_7/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -1437,41 +1488,6 @@
]
},
{
- "cmd": [],
- "name": "launch/collect.0.process results.fuchsia-0001.ensure bsdtar",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@"
- ]
- },
- {
- "cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd/bsdtar",
- "-ensure-file",
- "fuchsia/tools/bsdtar/${platform} latest",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "launch/collect.0.process results.fuchsia-0001.ensure bsdtar.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [
"[START_DIR]/cipd/bsdtar/bsdtar",
"--extract",
@@ -1766,14 +1782,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2175,7 +2189,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"fuchsia-0002\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2953,14 +2967,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2985,7 +2997,7 @@
"name": "passes.fuchsia-0000.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -3785,14 +3797,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_7/610/summary.json"
],
"infra_step": true,
"name": "upload fuchsia-0000 test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
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 39ceb05..4de71de 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
@@ -307,58 +307,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-multiplied:fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard multiplied:fuchsia-0000.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-multiplied:fuchsia-0000@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-multiplied:fuchsia-0000@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-multiplied:fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-multiplied:fuchsia-0000"
- ],
- "infra_step": true,
- "name": "shard multiplied:fuchsia-0000.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-multiplied:fuchsia-0000@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-multiplied:fuchsia-0000@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-multiplied:fuchsia-0000.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-multiplied:fuchsia-0000",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-multiplied:fuchsia-0000"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard multiplied:fuchsia-0000.create zbi",
"~followup_annotations": [
@@ -367,13 +321,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard multiplied:fuchsia-0000.create test image",
+ "infra_step": true,
+ "name": "shard multiplied:fuchsia-0000.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard multiplied:fuchsia-0000.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -411,7 +418,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-multiplied:fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-multiplied:fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-multiplied:fuchsia-0000.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-multiplied:fuchsia-0000.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard multiplied:fuchsia-0000.create tree of build artifacts",
@@ -509,7 +516,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"multiplied:fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"multiplied:fuchsia-0000\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -645,11 +652,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.multiplied:fuchsia-0000.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.multiplied:fuchsia-0000.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -745,14 +789,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -774,7 +816,7 @@
},
{
"cmd": [],
- "name": "launch/collect.0.failed tasks.multiplied:fuchsia-0000 (attempt 0).failed: fuchsia-pkg://fuchsia.com/hello",
+ "name": "launch/collect.0.failed tasks.multiplied:fuchsia-0000 (attempt 0).failed: /path/to/hello",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@stdio@hello@@@",
@@ -783,7 +825,7 @@
},
{
"cmd": [],
- "name": "launch/collect.0.failed tasks.multiplied:fuchsia-0000 (attempt 0).failed: fuchsia-pkg://fuchsia.com/goodbye",
+ "name": "launch/collect.0.failed tasks.multiplied:fuchsia-0000 (attempt 0).failed: /path/to/goodbye",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@4@@@",
"@@@STEP_LOG_LINE@stdio@goodbye@@@",
@@ -878,14 +920,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"FAIL\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -908,7 +948,7 @@
},
{
"cmd": [],
- "name": "failures.multiplied:fuchsia-0000.attempt 0 (fail).failed: fuchsia-pkg://fuchsia.com/hello",
+ "name": "failures.multiplied:fuchsia-0000.attempt 0 (fail).failed: /path/to/hello",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@stdio@hello@@@",
@@ -918,7 +958,7 @@
},
{
"cmd": [],
- "name": "failures.multiplied:fuchsia-0000.attempt 0 (fail).failed: fuchsia-pkg://fuchsia.com/goodbye",
+ "name": "failures.multiplied:fuchsia-0000.attempt 0 (fail).failed: /path/to/goodbye",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
"@@@STEP_LOG_LINE@stdio@goodbye@@@",
@@ -984,14 +1024,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"FAIL\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"FAIL\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"FAIL\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"FAIL\"}]}",
"[CLEANUP]/swarming_tmp_4/610/summary.json"
],
"infra_step": true,
"name": "upload multiplied:fuchsia-0000 test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"FAIL\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"FAIL\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"FAIL\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"FAIL\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
@@ -1055,7 +1095,7 @@
{
"failure": {
"failure": {},
- "humanReason": "Test failure(s): fuchsia-pkg://fuchsia.com/hello, fuchsia-pkg://fuchsia.com/goodbye"
+ "humanReason": "Test failure(s): /path/to/hello, /path/to/goodbye"
},
"name": "$result"
}
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 d40bdb7..020ab22 100644
--- a/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
+++ b/recipe_modules/testing/examples/full.expected/upload_to_catapult.json
@@ -307,58 +307,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -367,13 +321,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"arm64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"arm64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -411,7 +418,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/arm64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/arm64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/arm64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/arm64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -509,7 +516,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-arm64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"arm64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": [], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-arm64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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/core.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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -645,11 +652,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/0/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/0"
],
"infra_step": true,
@@ -744,14 +788,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -842,14 +884,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -874,7 +914,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -946,14 +986,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/0/summary.json"
],
"infra_step": true,
"name": "upload QEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
diff --git a/recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_aemu.json b/recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_aemu.json
similarity index 83%
rename from recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_aemu.json
rename to recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_aemu.json
index 1c57ae1..ca90036 100644
--- a/recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_aemu.json
+++ b/recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_aemu.json
@@ -307,12 +307,58 @@
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "/path/to/hello\n/path/to/goodbye\n",
+ "[CLEANUP]/tests-AEMU"
+ ],
+ "infra_step": true,
+ "name": "shard AEMU.write test list",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests-AEMU@/path/to/hello@@@",
+ "@@@STEP_LOG_LINE@tests-AEMU@/path/to/goodbye@@@",
+ "@@@STEP_LOG_END@tests-AEMU@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1\numount /tmp/infra-test-output\ndm poweroff",
+ "[CLEANUP]/runcmds-AEMU"
+ ],
+ "infra_step": true,
+ "name": "shard AEMU.write runcmds",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@mkdir /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@umount /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-AEMU@dm poweroff@@@",
+ "@@@STEP_LOG_END@runcmds-AEMU@@@"
+ ]
+ },
+ {
+ "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
+ "infra/runcmds=[CLEANUP]/runcmds-AEMU",
+ "-e",
+ "infra/shard.run=[CLEANUP]/tests-AEMU"
],
"name": "shard AEMU.create zbi",
"~followup_annotations": [
@@ -321,66 +367,13 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
- "[CLEANUP]/isolate_tmp_3/tests.json"
+ "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
+ "create"
],
- "infra_step": true,
- "name": "shard AEMU.write test manifest",
+ "name": "shard AEMU.create test image",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests.json@[@@@",
- "@@@STEP_LOG_LINE@tests.json@ {@@@",
- "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
- "@@@STEP_LOG_LINE@tests.json@ }, @@@",
- "@@@STEP_LOG_LINE@tests.json@ {@@@",
- "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
- "@@@STEP_LOG_LINE@tests.json@ }@@@",
- "@@@STEP_LOG_LINE@tests.json@]@@@",
- "@@@STEP_LOG_END@tests.json@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./aemu/bin\", \n \"type\": \"aemu\", \n \"cpu\": 8\n }\n]",
- "[CLEANUP]/isolate_tmp_3/qemu.json"
- ],
- "infra_step": true,
- "name": "shard AEMU.write qemu config",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@qemu.json@[@@@",
- "@@@STEP_LOG_LINE@qemu.json@ {@@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./aemu/bin\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"aemu\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
- "@@@STEP_LOG_LINE@qemu.json@ }@@@",
- "@@@STEP_LOG_LINE@qemu.json@]@@@",
- "@@@STEP_LOG_END@qemu.json@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -418,7 +411,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-AEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-AEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-AEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard AEMU.create tree of build artifacts",
@@ -516,7 +509,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"AEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:AEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/aemu/${platform}\", \"path\": \"aemu/bin\", \"version\": \"git_revision:058240c99e7a1b0782798a2e536f2be75b5f08cf\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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\": \"AEMU\"}, {\"key\": \"BUILDBUCKET_ID\", \"value\": \"8945511751514863184\"}, {\"key\": \"BUILD_BOARD\", \"value\": \"boards/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"AEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:AEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/aemu/${platform}\", \"path\": \"aemu/bin\", \"version\": \"git_revision:058240c99e7a1b0782798a2e536f2be75b5f08cf\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"aemu\", \"-qemu-dir\", \"./aemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -652,48 +645,11 @@
]
},
{
- "cmd": [],
- "name": "launch/collect.0.process results.AEMU.ensure bsdtar",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@"
- ]
- },
- {
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd/bsdtar",
- "-ensure-file",
- "fuchsia/tools/bsdtar/${platform} latest",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "launch/collect.0.process results.AEMU.ensure bsdtar.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/bsdtar/bsdtar",
- "--extract",
- "--verbose",
- "-f",
+ "[CLEANUP]/build-artifacts_tmp_1/minfs",
"[CLEANUP]/swarming_tmp_4/0/out.tar",
- "-C",
+ "cp",
+ "::",
"[CLEANUP]/test_results/0"
],
"infra_step": true,
@@ -788,12 +744,14 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -884,12 +842,14 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -914,7 +874,7 @@
"name": "passes.AEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
+ "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -986,14 +946,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/0/summary.json"
],
"infra_step": true,
"name": "upload AEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
diff --git a/recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_qemu.json b/recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_qemu.json
similarity index 83%
rename from recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_qemu.json
rename to recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_qemu.json
index d57b74f..5ef25f7 100644
--- a/recipe_modules/testing/examples/full.expected/with_experiment_ssh_into_qemu.json
+++ b/recipe_modules/testing/examples/full.expected/without_experiment_ssh_into_qemu.json
@@ -307,12 +307,58 @@
},
{
"cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "/path/to/hello\n/path/to/goodbye\n",
+ "[CLEANUP]/tests-QEMU"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write test list",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
+ "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
+ "@@@STEP_LOG_END@tests-QEMU@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1\numount /tmp/infra-test-output\ndm poweroff",
+ "[CLEANUP]/runcmds-QEMU"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write runcmds",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run -i 1@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
+ "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
+ "@@@STEP_LOG_END@runcmds-QEMU@@@"
+ ]
+ },
+ {
+ "cmd": [
"[CLEANUP]/build-artifacts_tmp_1/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi",
"[CLEANUP]/build-artifacts_tmp_1/fuchsia.zbi",
"-e",
- "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_1/authorized_key"
+ "infra/runcmds=[CLEANUP]/runcmds-QEMU",
+ "-e",
+ "infra/shard.run=[CLEANUP]/tests-QEMU"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -321,66 +367,13 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
- "[CLEANUP]/isolate_tmp_3/tests.json"
+ "[CLEANUP]/build-artifacts_tmp_1/minfs",
+ "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
+ "create"
],
- "infra_step": true,
- "name": "shard QEMU.write test manifest",
+ "name": "shard QEMU.create test image",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests.json@[@@@",
- "@@@STEP_LOG_LINE@tests.json@ {@@@",
- "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
- "@@@STEP_LOG_LINE@tests.json@ }, @@@",
- "@@@STEP_LOG_LINE@tests.json@ {@@@",
- "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
- "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
- "@@@STEP_LOG_LINE@tests.json@ }@@@",
- "@@@STEP_LOG_LINE@tests.json@]@@@",
- "@@@STEP_LOG_END@tests.json@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
- "[CLEANUP]/isolate_tmp_3/qemu.json"
- ],
- "infra_step": true,
- "name": "shard QEMU.write qemu config",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@qemu.json@[@@@",
- "@@@STEP_LOG_LINE@qemu.json@ {@@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
- "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
- "@@@STEP_LOG_LINE@qemu.json@ }@@@",
- "@@@STEP_LOG_LINE@qemu.json@]@@@",
- "@@@STEP_LOG_END@qemu.json@@@"
+ "@@@STEP_NEST_LEVEL@1@@@"
]
},
{
@@ -418,7 +411,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_1/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_1/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_1/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_1/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -516,7 +509,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"0s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"release\"}], \"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\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"0\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"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\": [\"output.fs\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -652,48 +645,11 @@
]
},
{
- "cmd": [],
- "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@4@@@"
- ]
- },
- {
"cmd": [
- "cipd",
- "ensure",
- "-root",
- "[START_DIR]/cipd/bsdtar",
- "-ensure-file",
- "fuchsia/tools/bsdtar/${platform} latest",
- "-json-output",
- "/path/to/tmp/json"
- ],
- "infra_step": true,
- "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@5@@@",
- "@@@STEP_LOG_LINE@json.output@{@@@",
- "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
- "cmd": [
- "[START_DIR]/cipd/bsdtar/bsdtar",
- "--extract",
- "--verbose",
- "-f",
+ "[CLEANUP]/build-artifacts_tmp_1/minfs",
"[CLEANUP]/swarming_tmp_4/0/out.tar",
- "-C",
+ "cp",
+ "::",
"[CLEANUP]/test_results/0"
],
"infra_step": true,
@@ -788,12 +744,14 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -884,12 +842,14 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -914,7 +874,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
+ "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -986,14 +946,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/0/summary.json"
],
"infra_step": true,
"name": "upload QEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
diff --git a/recipe_modules/testing/examples/full.py b/recipe_modules/testing/examples/full.py
index a552e16..b20e9d9 100644
--- a/recipe_modules/testing/examples/full.py
+++ b/recipe_modules/testing/examples/full.py
@@ -738,11 +738,12 @@
]) # yapf: disable
yield (api.testing.test(
- 'with_experiment_ssh_into_qemu',
+ 'without_experiment_ssh_into_qemu',
clear_default_steps=True,
properties={
+ 'experimental.ssh_into_qemu': False,
+ 'per_test_timeout_secs': 1,
'test_in_shards': True,
- 'experimental.ssh_into_qemu': True,
},
steps=[
api.testing.shards_step_data(shards=[
@@ -757,11 +758,12 @@
]))
yield (api.testing.test(
- 'with_experiment_ssh_into_aemu',
+ 'without_experiment_ssh_into_aemu',
clear_default_steps=True,
properties={
+ 'experimental.ssh_into_qemu': False,
+ 'per_test_timeout_secs': 1,
'test_in_shards': True,
- 'experimental.ssh_into_qemu': True,
},
steps=[
api.testing.shards_step_data(shards=[
diff --git a/recipes/fuchsia.expected/ci.json b/recipes/fuchsia.expected/ci.json
index adf8d25..bf50a13 100644
--- a/recipes/fuchsia.expected/ci.json
+++ b/recipes/fuchsia.expected/ci.json
@@ -2011,58 +2011,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2071,13 +2025,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2125,7 +2132,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2258,7 +2265,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2391,11 +2398,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2490,14 +2534,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2546,14 +2588,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2574,7 +2614,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/commit_snapshot.json b/recipes/fuchsia.expected/commit_snapshot.json
index b8d357e..27da613 100644
--- a/recipes/fuchsia.expected/commit_snapshot.json
+++ b/recipes/fuchsia.expected/commit_snapshot.json
@@ -2030,58 +2030,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2090,13 +2044,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2144,7 +2151,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2277,7 +2284,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2410,11 +2417,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2509,14 +2553,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2565,14 +2607,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2593,7 +2633,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/cq.json b/recipes/fuchsia.expected/cq.json
index 068ca93..f619b21 100644
--- a/recipes/fuchsia.expected/cq.json
+++ b/recipes/fuchsia.expected/cq.json
@@ -2191,58 +2191,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2251,13 +2205,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_4/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_4/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_4/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2305,7 +2312,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_4/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_4/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_4/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_4/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_4/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_4/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_4/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_4/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_4/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_4/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_4/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_4/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_4/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_4/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_4/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2438,7 +2445,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"try\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2571,11 +2578,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_5/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2670,14 +2714,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2726,14 +2768,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2754,7 +2794,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/max_shard_size.json b/recipes/fuchsia.expected/max_shard_size.json
index c2b3157..425d988 100644
--- a/recipes/fuchsia.expected/max_shard_size.json
+++ b/recipes/fuchsia.expected/max_shard_size.json
@@ -2014,58 +2014,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2074,13 +2028,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2128,7 +2135,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2261,7 +2268,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2394,11 +2401,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2493,14 +2537,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2549,14 +2591,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2577,7 +2617,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/patchset_snapshot.json b/recipes/fuchsia.expected/patchset_snapshot.json
index d94d38b..d3b8704 100644
--- a/recipes/fuchsia.expected/patchset_snapshot.json
+++ b/recipes/fuchsia.expected/patchset_snapshot.json
@@ -2217,58 +2217,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2277,13 +2231,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_4/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_4/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_4/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2331,7 +2338,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_4/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_4/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_4/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_4/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_4/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_4/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_4/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_4/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_4/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_4/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_4/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_4/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_4/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_4/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_4/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2464,7 +2471,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"try\"}, {\"key\": \"BUILD_TARGET\", \"value\": \"x64\"}, {\"key\": \"ASAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"UBSAN_SYMBOLIZER_PATH\", \"value\": \"llvm-symbolizer\"}, {\"key\": \"INPUT_COMMIT_PROJECT\", \"value\": \"garnet\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2597,11 +2604,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_5/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2696,14 +2740,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2752,14 +2794,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2780,7 +2820,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/profile.json b/recipes/fuchsia.expected/profile.json
index 4a29246..db9bb89 100644
--- a/recipes/fuchsia.expected/profile.json
+++ b/recipes/fuchsia.expected/profile.json
@@ -2336,58 +2336,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2396,13 +2350,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2450,7 +2457,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2583,7 +2590,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"-cpu\", \"8\", \"-memory\", \"8192\", \"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\": \"kvm\", \"value\": \"1\"}, {\"key\": \"os\", \"value\": \"Debian\"}, {\"key\": \"cpu\", \"value\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-use-runtests\", \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2716,11 +2723,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2815,14 +2859,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2871,14 +2913,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2899,7 +2939,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -2933,14 +2973,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/610/summary.json"
],
"infra_step": true,
"name": "upload QEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
diff --git a/recipes/fuchsia.expected/with_archives.json b/recipes/fuchsia.expected/with_archives.json
index 2938929..73dbd1f 100644
--- a/recipes/fuchsia.expected/with_archives.json
+++ b/recipes/fuchsia.expected/with_archives.json
@@ -2015,58 +2015,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2075,13 +2029,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2129,7 +2136,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2262,7 +2269,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2395,11 +2402,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2494,14 +2538,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2550,14 +2592,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2578,7 +2618,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
diff --git a/recipes/fuchsia.expected/with_uploading.json b/recipes/fuchsia.expected/with_uploading.json
index c9b3237..6e68457 100644
--- a/recipes/fuchsia.expected/with_uploading.json
+++ b/recipes/fuchsia.expected/with_uploading.json
@@ -2334,58 +2334,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/zbi",
"-o",
"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi",
"[START_DIR]/fuchsia/out/default/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[START_DIR]/fuchsia/.ssh/authorized_keys"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -2394,13 +2348,66 @@
},
{
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -2448,7 +2455,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
+ "{\"[START_DIR]/fuchsia/.ssh/pkey\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[START_DIR]/fuchsia/out/default/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[START_DIR]/fuchsia/out/default/fvm.blk\": [\"[CLEANUP]/isolate_tmp_3/fvm.blk\"], \"[START_DIR]/fuchsia/out/default/linux_x64/bootserver_new\": [\"[CLEANUP]/isolate_tmp_3/bootserver_new\"], \"[START_DIR]/fuchsia/out/default/linux_x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[START_DIR]/fuchsia/out/default/linux_x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"], \"[START_DIR]/fuchsia/out/default/multiboot.bin\": [\"[CLEANUP]/isolate_tmp_3/multiboot.bin\"], \"[START_DIR]/fuchsia/prebuilt/third_party/llvm-symbolizer/linux_x64/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -2581,7 +2588,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.system=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"18000\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/fuchsia-infra-artifacts/blobs\", \"-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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"debug\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -2714,11 +2721,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[START_DIR]/fuchsia/out/default.zircon/host-linux-x64/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -2813,14 +2857,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2869,14 +2911,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -2897,7 +2937,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -2931,14 +2971,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/610/summary.json"
],
"infra_step": true,
"name": "upload QEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
diff --git a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
index f6a1461..c19ec71 100644
--- a/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
+++ b/recipes/fuchsia/fuchsia.expected/successful_build_and_test.json
@@ -457,58 +457,12 @@
},
{
"cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "/path/to/hello\n/path/to/goodbye\n",
- "[CLEANUP]/tests-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write test list",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/hello@@@",
- "@@@STEP_LOG_LINE@tests-QEMU@/path/to/goodbye@@@",
- "@@@STEP_LOG_END@tests-QEMU@@@"
- ]
- },
- {
- "cmd": [
- "vpython",
- "-u",
- "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
- "--json-output",
- "/path/to/tmp/json",
- "copy",
- "mkdir /tmp/infra-test-output\nwaitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000\nmount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output\nruntests -o /tmp/infra-test-output -f /boot/infra/shard.run\numount /tmp/infra-test-output\ndm poweroff",
- "[CLEANUP]/runcmds-QEMU"
- ],
- "infra_step": true,
- "name": "shard QEMU.write runcmds",
- "~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mkdir /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@waitfor class=block topo=/dev/sys/pci/00:06.0/virtio-block/block timeout=60000@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@mount /dev/sys/pci/00:06.0/virtio-block/block /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@runtests -o /tmp/infra-test-output -f /boot/infra/shard.run@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@umount /tmp/infra-test-output@@@",
- "@@@STEP_LOG_LINE@runcmds-QEMU@dm poweroff@@@",
- "@@@STEP_LOG_END@runcmds-QEMU@@@"
- ]
- },
- {
- "cmd": [
"[CLEANUP]/build-artifacts_tmp_2/zbi",
"-o",
"[CLEANUP]/build-artifacts_tmp_2/fuchsia-QEMU.zbi",
"[CLEANUP]/build-artifacts_tmp_2/fuchsia.zbi",
"-e",
- "infra/runcmds=[CLEANUP]/runcmds-QEMU",
- "-e",
- "infra/shard.run=[CLEANUP]/tests-QEMU"
+ "data/ssh/authorized_keys=[CLEANUP]/build-artifacts_tmp_2/authorized_key"
],
"name": "shard QEMU.create zbi",
"~followup_annotations": [
@@ -517,13 +471,66 @@
},
{
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_2/minfs",
- "[CLEANUP]/isolate_tmp_3/output.fs@3584M",
- "create"
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"name\": \"hello\", \n \"install_path\": \"/path/to/hello\", \n \"label\": \"//a/b/c:hello_test(//toolchain)\", \n \"path\": \"/path/to/hello\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", \n \"os\": \"fuchsia\"\n }, \n {\n \"name\": \"goodbye\", \n \"install_path\": \"/path/to/goodbye\", \n \"label\": \"//a/b/c:goodbye_test(//toolchain)\", \n \"path\": \"/path/to/goodbye\", \n \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", \n \"os\": \"fuchsia\"\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/tests.json"
],
- "name": "shard QEMU.create test image",
+ "infra_step": true,
+ "name": "shard QEMU.write test manifest",
"~followup_annotations": [
- "@@@STEP_NEST_LEVEL@1@@@"
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@tests.json@[@@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }, @@@",
+ "@@@STEP_LOG_LINE@tests.json@ {@@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"name\": \"goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"install_path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"path\": \"/path/to/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"package_url\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@tests.json@ \"os\": \"fuchsia\"@@@",
+ "@@@STEP_LOG_LINE@tests.json@ }@@@",
+ "@@@STEP_LOG_LINE@tests.json@]@@@",
+ "@@@STEP_LOG_END@tests.json@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "vpython",
+ "-u",
+ "RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
+ "--json-output",
+ "/path/to/tmp/json",
+ "copy",
+ "[\n {\n \"target\": \"x64\", \n \"kvm\": true, \n \"memory\": 8192, \n \"path\": \"./qemu/bin\", \n \"type\": \"qemu\", \n \"cpu\": 8\n }\n]",
+ "[CLEANUP]/isolate_tmp_3/qemu.json"
+ ],
+ "infra_step": true,
+ "name": "shard QEMU.write qemu config",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@qemu.json@[@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ {@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"target\": \"x64\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"kvm\": true, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"memory\": 8192, @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"path\": \"./qemu/bin\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"type\": \"qemu\", @@@",
+ "@@@STEP_LOG_LINE@qemu.json@ \"cpu\": 8@@@",
+ "@@@STEP_LOG_LINE@qemu.json@ }@@@",
+ "@@@STEP_LOG_LINE@qemu.json@]@@@",
+ "@@@STEP_LOG_END@qemu.json@@@"
]
},
{
@@ -561,7 +568,7 @@
"-u",
"RECIPE_MODULE[recipe_engine::file]/resources/symlink.py",
"--link-json",
- "{\"[CLEANUP]/build-artifacts_tmp_2/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_2/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_2/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_2/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_2/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
+ "{\"[CLEANUP]/build-artifacts_tmp_2/bootserver\": [\"[CLEANUP]/isolate_tmp_3/bootserver\"], \"[CLEANUP]/build-artifacts_tmp_2/fuchsia-QEMU.zbi\": [\"[CLEANUP]/isolate_tmp_3/fuchsia-QEMU.zbi\"], \"[CLEANUP]/build-artifacts_tmp_2/llvm-symbolizer\": [\"[CLEANUP]/isolate_tmp_3/llvm-symbolizer\"], \"[CLEANUP]/build-artifacts_tmp_2/private_key\": [\"[CLEANUP]/isolate_tmp_3/private_key\"], \"[CLEANUP]/build-artifacts_tmp_2/x64/botanist\": [\"[CLEANUP]/isolate_tmp_3/botanist\"], \"[CLEANUP]/build-artifacts_tmp_2/x64/testrunner\": [\"[CLEANUP]/isolate_tmp_3/testrunner\"]}"
],
"infra_step": true,
"name": "shard QEMU.create tree of build artifacts",
@@ -659,7 +666,7 @@
"-server",
"https://example.swarmingserver.appspot.com",
"-json-input",
- "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\", \"uses_legacy_qemu:true\"], \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"qemu\", \"-type\", \"qemu\", \"-qemu-dir\", \"./qemu/bin\", \"-images\", \"images.json\", \"-arch\", \"x64\", \"-minfs\", \"output.fs\", \"-pci-addr\", \"06.0\", \"-use-kvm\", \"zircon.autorun.boot=/boot/bin/sh+/boot/infra/runcmds\"], \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"output.fs\"]}}], \"user\": null}]}",
+ "{\"requests\": [{\"name\": \"QEMU\", \"priority\": \"200\", \"service_account\": \"\", \"tags\": [\"test_environment_name:QEMU-x64\"], \"task_slices\": [{\"expiration_secs\": \"600\", \"properties\": {\"cipd_input\": {\"packages\": [{\"package_name\": \"fuchsia/third_party/qemu/${platform}\", \"path\": \"qemu\", \"version\": \"git_revision:533bf2563d0213a7e002d9fcde75519d30ffa70f\"}]}, \"command\": [\"./botanist\", \"-level\", \"debug\", \"run\", \"-images\", \"images.json\", \"-timeout\", \"1800s\", \"-syslog\", \"syslog.txt\", \"-serial-log\", \"serial.txt\", \"-repo\", \"http://$GCS_PROXY_HOST/gcs-bucket/8945511751514863184/repository\", \"-blobs\", \"http://$GCS_PROXY_HOST/gcs-bucket/blobs\", \"-ssh\", \"private_key\", \"-config\", \"./qemu.json\", \"./testrunner\", \"-archive\", \"out.tar\", \"-use-runtests\", \"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\": \"x64\"}, {\"key\": \"pool\", \"value\": \"fuchsia.tests\"}], \"env\": [{\"key\": \"BUILD_PRODUCT\", \"value\": \"products/core.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\": \"x64\"}, {\"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/x64.gni\"}, {\"key\": \"BUILD_CREATE_TIME\", \"value\": \"1527292217\"}, {\"key\": \"BUILD_TYPE\", \"value\": \"build_type\"}], \"env_prefixes\": [], \"execution_timeout_secs\": \"1800\", \"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\": [\"syslog.txt\", \"serial.txt\", \"out.tar\"]}}], \"user\": null}]}",
"-json-output",
"/path/to/tmp/json",
"-cancel-extra-tasks"
@@ -792,11 +799,48 @@
]
},
{
+ "cmd": [],
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@4@@@"
+ ]
+ },
+ {
"cmd": [
- "[CLEANUP]/build-artifacts_tmp_2/minfs",
+ "cipd",
+ "ensure",
+ "-root",
+ "[START_DIR]/cipd/bsdtar",
+ "-ensure-file",
+ "fuchsia/tools/bsdtar/${platform} latest",
+ "-json-output",
+ "/path/to/tmp/json"
+ ],
+ "infra_step": true,
+ "name": "launch/collect.0.process results.QEMU.ensure bsdtar.ensure_installed",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@5@@@",
+ "@@@STEP_LOG_LINE@json.output@{@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
+ "@@@STEP_LOG_LINE@json.output@ {@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"fuchsia/tools/bsdtar/resolved-platform\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[START_DIR]/cipd/bsdtar/bsdtar",
+ "--extract",
+ "--verbose",
+ "-f",
"[CLEANUP]/swarming_tmp_4/610/out.tar",
- "cp",
- "::",
+ "-C",
"[CLEANUP]/test_results/610"
],
"infra_step": true,
@@ -891,14 +935,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -947,14 +989,12 @@
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ \"tests\": [@@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:hello_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/hello\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/hello\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"hello.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }, @@@",
"@@@STEP_LOG_LINE@summary.json@ {@@@",
- "@@@STEP_LOG_LINE@summary.json@ \"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", @@@",
- "@@@STEP_LOG_LINE@summary.json@ \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", @@@",
+ "@@@STEP_LOG_LINE@summary.json@ \"name\": \"/path/to/goodbye\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"output_file\": \"goodbye.out\", @@@",
"@@@STEP_LOG_LINE@summary.json@ \"result\": \"PASS\"@@@",
"@@@STEP_LOG_LINE@summary.json@ }@@@",
@@ -975,7 +1015,7 @@
"name": "passes.QEMU.attempt 0 (pass).all passed tests",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@3@@@",
- "@@@STEP_TEXT@<br/>fuchsia-pkg://fuchsia.com/hello<br/>fuchsia-pkg://fuchsia.com/goodbye@@@",
+ "@@@STEP_TEXT@<br/>/path/to/hello<br/>/path/to/goodbye@@@",
"@@@STEP_SUMMARY_TEXT@2 passed tests@@@"
]
},
@@ -1009,14 +1049,14 @@
"--json-output",
"/path/to/tmp/json",
"copy",
- "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}",
+ "{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}",
"[CLEANUP]/swarming_tmp_4/610/summary.json"
],
"infra_step": true,
"name": "upload QEMU test results.write summary.json",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"gn_label\": \"//a/b/c:hello_test(//toolchain)\", \"output_file\": \"hello.out\", \"name\": \"fuchsia-pkg://fuchsia.com/hello\", \"result\": \"PASS\"}, {\"gn_label\": \"//a/b/c:goodbye_test(//toolchain)\", \"output_file\": \"goodbye.out\", \"name\": \"fuchsia-pkg://fuchsia.com/goodbye\", \"result\": \"PASS\"}]}@@@",
+ "@@@STEP_LOG_LINE@summary.json@{\"outputs\": {\"goodbye-txt\": \"goodbye.txt\"}, \"tests\": [{\"output_file\": \"hello.out\", \"name\": \"/path/to/hello\", \"result\": \"PASS\"}, {\"output_file\": \"goodbye.out\", \"name\": \"/path/to/goodbye\", \"result\": \"PASS\"}]}@@@",
"@@@STEP_LOG_END@summary.json@@@"
]
},
