Removes the first instance of running sub tests, as they are being run twice accidentally. Change-Id: Ib978fc56ffc49ec44e5496fc5ab28157d8c8e120 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/41780 Commit-Queue: Drew Roen <drewroen@google.com> Reviewed-by: Godofredo Contreras <godofredoc@google.com> (cherry picked from commit 74286dd86d67cd0622ea7d9ca578283b6c07035d) Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/43721 Commit-Queue: Godofredo Contreras <godofredoc@google.com> Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/recipes/engine_v2/engine_v2.expected/basic_linux.json b/recipes/engine_v2/engine_v2.expected/basic_linux.json index aef7033..8364c19 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_linux.json +++ b/recipes/engine_v2/engine_v2.expected/basic_linux.json
@@ -291,18 +291,6 @@ ] }, { - "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { "cmd": [ "vpython3", "-u", @@ -701,15 +689,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.expected/basic_mac.json b/recipes/engine_v2/engine_v2.expected/basic_mac.json index 92eb2fa..4e35269 100644 --- a/recipes/engine_v2/engine_v2.expected/basic_mac.json +++ b/recipes/engine_v2/engine_v2.expected/basic_mac.json
@@ -286,18 +286,6 @@ ] }, { - "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { "cmd": [ "vpython3", "-u", @@ -983,15 +971,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json index 338d786..62f9866 100644 --- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json +++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -667,18 +667,6 @@ ] }, { - "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { "cmd": [ "vpython3", "-u", @@ -2142,15 +2130,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.expected/config_from_file.json b/recipes/engine_v2/engine_v2.expected/config_from_file.json index c8f1a4c..feef63c 100644 --- a/recipes/engine_v2/engine_v2.expected/config_from_file.json +++ b/recipes/engine_v2/engine_v2.expected/config_from_file.json
@@ -594,18 +594,6 @@ ] }, { - "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { "cmd": [ "vpython3", "-u", @@ -881,15 +869,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json index 8368722..7c6577d 100644 --- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json +++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file.json
@@ -631,18 +631,6 @@ }, { "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { - "cmd": [], "name": "Identify branches (3)" }, { @@ -699,15 +687,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json index 6652584..cd4a708 100644 --- a/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json +++ b/recipes/engine_v2/engine_v2.expected/monorepo_config_file_tests.json
@@ -667,251 +667,6 @@ ] }, { - "cmd": [], - "name": "launch tests" - }, - { - "cmd": [ - "bb", - "batch", - "-host", - "cr-buildbucket.appspot.com" - ], - "infra_step": true, - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "launch tests.schedule", - "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"Linux Engine Drone\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"name\": \"framework_tests libraries\", \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [], \"shard\": \"framework_tests\", \"subshard\": \"libraries\", \"test_dependencies\": [{\"dependency\": \"android_sdk\", \"version\": \"version:33v6\"}]}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": \"subtest1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"id\": \"8945511751514863187\"@@@", - "@@@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@@@", - "@@@STEP_LOG_LINE@request@{@@@", - "@@@STEP_LOG_LINE@request@ \"requests\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@", - "@@@STEP_LOG_LINE@request@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@request@ \"bucket\": \"ci.sandbox\", @@@", - "@@@STEP_LOG_LINE@request@ \"builder\": \"Linux Engine Drone\", @@@", - "@@@STEP_LOG_LINE@request@ \"project\": \"dart\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"exe\": {@@@", - "@@@STEP_LOG_LINE@request@ \"cipdVersion\": \"refs/heads/main\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@", - "@@@STEP_LOG_LINE@request@ \"experiments\": {@@@", - "@@@STEP_LOG_LINE@request@ \"luci.buildbucket.parent_tracking\": false@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", @@@", - "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@", - "@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@", - "@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", @@@", - "@@@STEP_LOG_LINE@request@ \"project\": \"monorepo\", @@@", - "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@", - "@@@STEP_LOG_LINE@request@ \"properties\": {@@@", - "@@@STEP_LOG_LINE@request@ \"build\": {@@@", - "@@@STEP_LOG_LINE@request@ \"name\": \"framework_tests libraries\", @@@", - "@@@STEP_LOG_LINE@request@ \"recipe\": \"engine_v2/tester\", @@@", - "@@@STEP_LOG_LINE@request@ \"resolved_deps\": [], @@@", - "@@@STEP_LOG_LINE@request@ \"shard\": \"framework_tests\", @@@", - "@@@STEP_LOG_LINE@request@ \"subshard\": \"libraries\", @@@", - "@@@STEP_LOG_LINE@request@ \"test_dependencies\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"dependency\": \"android_sdk\", @@@", - "@@@STEP_LOG_LINE@request@ \"version\": \"version:33v6\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"config_name\": \"config_name\", @@@", - "@@@STEP_LOG_LINE@request@ \"gclient_variables\": {}, @@@", - "@@@STEP_LOG_LINE@request@ \"recipe\": \"engine_v2/tester\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", @@@", - "@@@STEP_LOG_LINE@request@ \"swarming\": {@@@", - "@@@STEP_LOG_LINE@request@ \"parentRunId\": \"fake-task-id\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"tags\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"key\": \"parent_buildbucket_id\", @@@", - "@@@STEP_LOG_LINE@request@ \"value\": \"8945511751514863184\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@", - "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@}@@@", - "@@@STEP_LOG_END@request@@@", - "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" - ] - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "collect tests.collect", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@" - ] - }, - { - "cmd": [ - "bb", - "collect", - "-host", - "cr-buildbucket.appspot.com", - "-interval", - "20s", - "8945511751514863187" - ], - "infra_step": true, - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "collect tests.collect.wait", - "timeout": 86400, - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@" - ] - }, - { - "cmd": [ - "bb", - "batch", - "-host", - "cr-buildbucket.appspot.com" - ], - "infra_step": true, - "luci_context": { - "realm": { - "name": "dart:ci.sandbox" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "collect tests.collect.get", - "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8945511751514863187\"}}]}", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@2@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"getBuild\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": \"subtest1\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"createTime\": \"2018-05-25T23:50:17Z\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"createdBy\": \"project:fuchsia\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"id\": \"8945511751514863187\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"resultdb\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"invocation\": \"invocations/build:8945511751514863187\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"priority\": 30, @@@", - "@@@STEP_LOG_LINE@json.output@ \"taskId\": \"abc123\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"input\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"gerritChanges\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"change\": \"123456\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"host\": \"chromium-review.googlesource.com\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"patchset\": \"7\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"output\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"status\": \"SUCCESS\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"tags\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"key\": \"cq_experimental\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"value\": \"false\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@request@{@@@", - "@@@STEP_LOG_LINE@request@ \"requests\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"getBuild\": {@@@", - "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", @@@", - "@@@STEP_LOG_LINE@request@ \"id\": \"8945511751514863187\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@}@@@", - "@@@STEP_LOG_END@request@@@", - "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" - ] - }, - { - "cmd": [], - "name": "display tests" - }, - { - "cmd": [], - "name": "display tests.framework_tests libraries", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" - ] - }, - { "cmd": [ "vpython3", "-u", @@ -1456,7 +1211,7 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [ @@ -1478,8 +1233,8 @@ "hostname": "rdbhost" } }, - "name": "launch tests (2).schedule", - "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"Linux Engine Drone\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"name\": \"framework_tests libraries\", \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [], \"shard\": \"framework_tests\", \"subshard\": \"libraries\", \"test_dependencies\": [{\"dependency\": \"android_sdk\", \"version\": \"version:33v6\"}]}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", + "name": "launch tests.schedule", + "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"Linux Engine Drone\", \"project\": \"dart\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"monorepo\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"build\": {\"name\": \"framework_tests libraries\", \"recipe\": \"engine_v2/tester\", \"resolved_deps\": [], \"shard\": \"framework_tests\", \"subshard\": \"libraries\", \"test_dependencies\": [{\"dependency\": \"android_sdk\", \"version\": \"version:33v6\"}]}, \"config_name\": \"config_name\", \"gclient_variables\": {}, \"recipe\": \"engine_v2/tester\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", "@@@STEP_LOG_LINE@json.output@{@@@", @@ -1487,11 +1242,11 @@ "@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@", "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"ci.sandbox\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": \"Linux Engine Drone\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"project\": \"dart\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"builder\": \"subtest1\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514002\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"id\": \"8945511751514863187\"@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -1539,7 +1294,7 @@ "@@@STEP_LOG_LINE@request@ \"gclient_variables\": {}, @@@", "@@@STEP_LOG_LINE@request@ \"recipe\": \"engine_v2/tester\"@@@", "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133d\", @@@", + "@@@STEP_LOG_LINE@request@ \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", @@@", "@@@STEP_LOG_LINE@request@ \"swarming\": {@@@", "@@@STEP_LOG_LINE@request@ \"parentRunId\": \"fake-task-id\"@@@", "@@@STEP_LOG_LINE@request@ }, @@@", @@ -1558,16 +1313,16 @@ "@@@STEP_LOG_LINE@request@ ]@@@", "@@@STEP_LOG_LINE@request@}@@@", "@@@STEP_LOG_END@request@@@", - "@@@STEP_LINK@8922054662172514002@https://cr-buildbucket.appspot.com/build/8922054662172514002@@@" + "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" ] }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "collect tests (2).collect", + "name": "collect tests.collect", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@" ] @@ -1580,7 +1335,7 @@ "cr-buildbucket.appspot.com", "-interval", "20s", - "8922054662172514002" + "8945511751514863187" ], "infra_step": true, "luci_context": { @@ -1595,7 +1350,7 @@ "hostname": "rdbhost" } }, - "name": "collect tests (2).collect.wait", + "name": "collect tests.collect.wait", "timeout": 86400, "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@" @@ -1621,16 +1376,53 @@ "hostname": "rdbhost" } }, - "name": "collect tests (2).collect.get", - "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8922054662172514002\"}}]}", + "name": "collect tests.collect.get", + "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8945511751514863187\"}}]}", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@", "@@@STEP_LOG_LINE@json.output@{@@@", "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@", "@@@STEP_LOG_LINE@json.output@ {@@@", "@@@STEP_LOG_LINE@json.output@ \"getBuild\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514002\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"status\": \"SUCCESS\"@@@", + "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"builder\": \"subtest1\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"createTime\": \"2018-05-25T23:50:17Z\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"createdBy\": \"project:fuchsia\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"id\": \"8945511751514863187\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"infra\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"resultdb\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"invocation\": \"invocations/build:8945511751514863187\"@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"priority\": 30, @@@", + "@@@STEP_LOG_LINE@json.output@ \"taskId\": \"abc123\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"input\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"gerritChanges\": [@@@", + "@@@STEP_LOG_LINE@json.output@ {@@@", + "@@@STEP_LOG_LINE@json.output@ \"change\": \"123456\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"host\": \"chromium-review.googlesource.com\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"patchset\": \"7\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"project\": \"fuchsia\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ ]@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"output\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@", + "@@@STEP_LOG_LINE@json.output@ \"test_orchestration_inputs_hash\": \"abc\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ }, @@@", + "@@@STEP_LOG_LINE@json.output@ \"status\": \"SUCCESS\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"tags\": [@@@", + "@@@STEP_LOG_LINE@json.output@ {@@@", + "@@@STEP_LOG_LINE@json.output@ \"key\": \"cq_experimental\", @@@", + "@@@STEP_LOG_LINE@json.output@ \"value\": \"false\"@@@", + "@@@STEP_LOG_LINE@json.output@ }@@@", + "@@@STEP_LOG_LINE@json.output@ ]@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ }@@@", "@@@STEP_LOG_LINE@json.output@ ]@@@", @@ -1641,25 +1433,25 @@ "@@@STEP_LOG_LINE@request@ {@@@", "@@@STEP_LOG_LINE@request@ \"getBuild\": {@@@", "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", @@@", - "@@@STEP_LOG_LINE@request@ \"id\": \"8922054662172514002\"@@@", + "@@@STEP_LOG_LINE@request@ \"id\": \"8945511751514863187\"@@@", "@@@STEP_LOG_LINE@request@ }@@@", "@@@STEP_LOG_LINE@request@ }@@@", "@@@STEP_LOG_LINE@request@ ]@@@", "@@@STEP_LOG_LINE@request@}@@@", "@@@STEP_LOG_END@request@@@", - "@@@STEP_LINK@8922054662172514002@https://cr-buildbucket.appspot.com/build/8922054662172514002@@@" + "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" ] }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "cmd": [], - "name": "display tests (2).framework_tests libraries", + "name": "display tests.framework_tests libraries", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LINK@8922054662172514002@https://cr-buildbucket.appspot.com/build/8922054662172514002@@@" + "@@@STEP_LINK@8945511751514863187@https://cr-buildbucket.appspot.com/build/8945511751514863187@@@" ] }, {
diff --git a/recipes/engine_v2/engine_v2.expected/monorepo_try.json b/recipes/engine_v2/engine_v2.expected/monorepo_try.json index 844079c..57c168c 100644 --- a/recipes/engine_v2/engine_v2.expected/monorepo_try.json +++ b/recipes/engine_v2/engine_v2.expected/monorepo_try.json
@@ -280,18 +280,6 @@ "name": "display tests" }, { - "cmd": [], - "name": "launch tests (2)" - }, - { - "cmd": [], - "name": "collect tests (2)" - }, - { - "cmd": [], - "name": "display tests (2)" - }, - { "name": "$result" } ] \ No newline at end of file
diff --git a/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json b/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json index 058f68d..cfb5804 100644 --- a/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json +++ b/recipes/engine_v2/engine_v2.expected/overridden_config_from_file.json
@@ -301,18 +301,6 @@ }, { "cmd": [], - "name": "launch tests" - }, - { - "cmd": [], - "name": "collect tests" - }, - { - "cmd": [], - "name": "display tests" - }, - { - "cmd": [], "name": "Identify branches (2)" }, { @@ -369,15 +357,15 @@ }, { "cmd": [], - "name": "launch tests (2)" + "name": "launch tests" }, { "cmd": [], - "name": "collect tests (2)" + "name": "collect tests" }, { "cmd": [], - "name": "display tests (2)" + "name": "display tests" }, { "name": "$result"
diff --git a/recipes/engine_v2/engine_v2.py b/recipes/engine_v2/engine_v2.py index fb1dbb3..7c0bbb5 100644 --- a/recipes/engine_v2/engine_v2.py +++ b/recipes/engine_v2/engine_v2.py
@@ -97,6 +97,8 @@ current_branch = 'main' if checkout_path and api.repo_util.is_release_candidate_branch(checkout_path): current_branch = api.repo_util.release_candidate_branch(checkout_path) + + # Execute subbuilds with api.step.nest('launch builds') as presentation: tasks = api.shard_util_v2.schedule_builds( builds, presentation, branch=current_branch @@ -110,19 +112,6 @@ raise_on_failure=True, ) - # Run tests - with api.step.nest('launch tests') as presentation: - tasks = api.shard_util_v2.schedule_tests(tests, build_results, presentation) - with api.step.nest('collect tests') as presentation: - test_results = api.shard_util_v2.collect(tasks, presentation) - - api.display_util.display_subbuilds( - step_name='display tests', - subbuilds=test_results, - raise_on_failure=True, - ) - - signing_file_list = [] # Global generators if generators or archives or (