Fix recipe roll blockers * Add config_name to tests avoid `None` in paths. * Add build names to tests to avoid `None` in paths. * Add task_name to avoid `None` in paths. * Add test value for 'PROGRAMFILES(X86)' environment variable to avoid `None` in paths. * Remove remnants or "unreal" led builds. Change-Id: Ia1be993b64d71f8bcacd535e865e09bfd6d25cbd Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/59661 Reviewed-by: Christopher Fujino <fujino@google.com> Commit-Queue: Christopher Fujino <fujino@google.com>
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json index 7394ce4..c4c586f 100644 --- a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json +++ b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_installed.json
@@ -889,7 +889,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json index f89f394..585d74d 100644 --- a/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json +++ b/recipe_modules/flutter_deps/examples/full.expected/windows_vs_not_installed.json
@@ -895,7 +895,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/os_utils/api.py b/recipe_modules/os_utils/api.py index 38487e0..7f2d536 100644 --- a/recipe_modules/os_utils/api.py +++ b/recipe_modules/os_utils/api.py
@@ -841,10 +841,9 @@ return False vswhere_path = self.m.path.join( - os.environ.get('PROGRAMFILES(X86)'), - 'Microsoft Visual Studio', - 'Installer', - 'vswhere.exe', + 'C:\\Program Files (x86)' + if self._test_data.enabled else os.environ.get('PROGRAMFILES(X86)'), + 'Microsoft Visual Studio\\Installer\\vswhere.exe' ) # Return mocked result for testing.
diff --git a/recipe_modules/os_utils/examples/full.expected/win_mismatched_version.json b/recipe_modules/os_utils/examples/full.expected/win_mismatched_version.json index 2d6a08e..7c8d3ef 100644 --- a/recipe_modules/os_utils/examples/full.expected/win_mismatched_version.json +++ b/recipe_modules/os_utils/examples/full.expected/win_mismatched_version.json
@@ -84,7 +84,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format", @@ -102,7 +102,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/os_utils/examples/full.expected/win_no_vs_version.json b/recipe_modules/os_utils/examples/full.expected/win_no_vs_version.json index b6567e4..144e376 100644 --- a/recipe_modules/os_utils/examples/full.expected/win_no_vs_version.json +++ b/recipe_modules/os_utils/examples/full.expected/win_no_vs_version.json
@@ -84,7 +84,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format", @@ -98,7 +98,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/os_utils/examples/full.expected/win_with_vs_version.json b/recipe_modules/os_utils/examples/full.expected/win_with_vs_version.json index 03c41b1..a12548b 100644 --- a/recipe_modules/os_utils/examples/full.expected/win_with_vs_version.json +++ b/recipe_modules/os_utils/examples/full.expected/win_with_vs_version.json
@@ -84,7 +84,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format", @@ -105,7 +105,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/os_utils/examples/full.expected/with_failures.json b/recipe_modules/os_utils/examples/full.expected/with_failures.json index b6567e4..144e376 100644 --- a/recipe_modules/os_utils/examples/full.expected/with_failures.json +++ b/recipe_modules/os_utils/examples/full.expected/with_failures.json
@@ -84,7 +84,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format", @@ -98,7 +98,7 @@ }, { "cmd": [ - "None\\Microsoft Visual Studio\\Installer\\vswhere.exe", + "C:\\Program Files (x86)\\Microsoft Visual Studio\\Installer\\vswhere.exe", "-legacy", "-prerelease", "-format",
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py index 9f48716..574292c 100644 --- a/recipe_modules/repo_util/api.py +++ b/recipe_modules/repo_util/api.py
@@ -634,6 +634,10 @@ checkout_path / f'flutter/ci/builders/standalone/{config_name}.json' ) config = self.m.file.read_json( - 'Read build config file', config_path, test_data={} + 'Read build config file', + config_path, + test_data={ + "name": "flutter/build", + } ) return config
diff --git a/recipe_modules/repo_util/examples/full.expected/bot_update.json b/recipe_modules/repo_util/examples/full.expected/bot_update.json index 2d5c191..5c45424 100644 --- a/recipe_modules/repo_util/examples/full.expected/bot_update.json +++ b/recipe_modules/repo_util/examples/full.expected/bot_update.json
@@ -842,14 +842,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json b/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json index 2c0f67f..6d53ca8 100644 --- a/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json +++ b/recipe_modules/repo_util/examples/full.expected/first_bot_update_failed.json
@@ -1074,14 +1074,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json b/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json index e7abb76..53c5682 100644 --- a/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json +++ b/recipe_modules/repo_util/examples/full.expected/first_bot_update_revision_not_found.json
@@ -992,14 +992,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/mac.json b/recipe_modules/repo_util/examples/full.expected/mac.json index 055a2e2..f8825e4 100644 --- a/recipe_modules/repo_util/examples/full.expected/mac.json +++ b/recipe_modules/repo_util/examples/full.expected/mac.json
@@ -1052,14 +1052,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json index 84cf04f..d39ca9d 100644 --- a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json +++ b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate.json
@@ -1092,14 +1092,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json index 657b7b2..40b1bf1 100644 --- a/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json +++ b/recipe_modules/repo_util/examples/full.expected/mac_release_candidate_sha_mismatch.json
@@ -1072,14 +1072,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo.json b/recipe_modules/repo_util/examples/full.expected/monorepo.json index bad3255..f71e4c0 100644 --- a/recipe_modules/repo_util/examples/full.expected/monorepo.json +++ b/recipe_modules/repo_util/examples/full.expected/monorepo.json
@@ -1416,7 +1416,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, @@ -1434,8 +1434,10 @@ }, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json index 7155a0e..d67122b 100644 --- a/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json +++ b/recipe_modules/repo_util/examples/full.expected/monorepo_first_bot_update_failed.json
@@ -1989,7 +1989,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, @@ -2007,8 +2007,10 @@ }, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json index f0bb6bb..4a90848 100644 --- a/recipe_modules/repo_util/examples/full.expected/monorepo_release.json +++ b/recipe_modules/repo_util/examples/full.expected/monorepo_release.json
@@ -1806,7 +1806,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, @@ -1824,8 +1824,10 @@ }, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json b/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json index eb57ef7..2ca1d2b 100644 --- a/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json +++ b/recipe_modules/repo_util/examples/full.expected/monorepo_tryjob.json
@@ -1596,7 +1596,7 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]/flutter/ci/builders/standalone/None.json", + "[START_DIR]/flutter/ci/builders/standalone/build_config.json.json", "/path/to/tmp/" ], "infra_step": true, @@ -1614,8 +1614,10 @@ }, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.expected/win.json b/recipe_modules/repo_util/examples/full.expected/win.json index d29daeb..561f7b2 100644 --- a/recipe_modules/repo_util/examples/full.expected/win.json +++ b/recipe_modules/repo_util/examples/full.expected/win.json
@@ -1122,14 +1122,16 @@ "--json-output", "/path/to/tmp/json", "copy", - "[START_DIR]\\flutter\\ci\\builders\\standalone\\None.json", + "[START_DIR]\\flutter\\ci\\builders\\standalone\\build_config.json.json", "/path/to/tmp/" ], "infra_step": true, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@None.json@{}@@@", - "@@@STEP_LOG_END@None.json@@@" + "@@@STEP_LOG_LINE@build_config.json.json@{@@@", + "@@@STEP_LOG_LINE@build_config.json.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@build_config.json.json@}@@@", + "@@@STEP_LOG_END@build_config.json.json@@@" ] }, {
diff --git a/recipe_modules/repo_util/examples/full.py b/recipe_modules/repo_util/examples/full.py index 9d1217d..3b7136d 100644 --- a/recipe_modules/repo_util/examples/full.py +++ b/recipe_modules/repo_util/examples/full.py
@@ -63,8 +63,7 @@ def GenTests(api): yield ( api.test( - 'force_get_candidate_branch', - api.expect_exception('ValueError'), + 'force_get_candidate_branch', api.expect_exception('ValueError'), api.properties( force_get_release_candidate_branch=True, git_branch='beta', @@ -72,6 +71,7 @@ git_url='https://github.com/flutter/engine', git_ref='refs/pull/1/head', clobber=True, + config_name='build_config.json', package_sharding='shard1', channel='stable', env_variables={"key1": "value1"} @@ -93,6 +93,7 @@ git_url='https://github.com/flutter/engine', git_ref='refs/pull/1/head', clobber=True, + config_name='build_config.json', package_sharding='shard1', channel='stable', env_variables={"key1": "value1"} @@ -126,6 +127,7 @@ git_url='https://github.com/flutter/engine', git_ref='refs/heads/flutter-3.2-candidate.5', clobber=True, + config_name='build_config.json', package_sharding='shard1', channel='stable', env_variables={"key1": "value1"} @@ -159,17 +161,16 @@ git_url='https://github.com/flutter/engine', git_ref='refs/heads/flutter-3.2-candidate.5', clobber=True, + config_name='build_config.json', package_sharding='shard1', channel='stable', env_variables={"key1": "value1"} ), api.repo_util.flutter_environment_data(), api.step_data( - 'git rev-parse', - stdout=api.raw_io.output_text('abchash') + 'git rev-parse', stdout=api.raw_io.output_text('abchash') ), api.step_data( - 'git rev-parse (2)', - stdout=api.raw_io.output_text('defhash') + 'git rev-parse (2)', stdout=api.raw_io.output_text('defhash') ), api.step_data( 'Identify branches.git branch', @@ -200,6 +201,7 @@ git_url='https://github.com/flutter/engine', git_ref='refs/pull/1/head', clobber=True, + config_name='build_config.json', package_sharding='shard1', channel='stable', ), api.repo_util.flutter_environment_data(), @@ -237,16 +239,23 @@ ) yield api.test( 'monorepo_release', api.repo_util.flutter_environment_data(), - api.properties(git_branch='beta', clobber=True), - api.monorepo.ci_build(git_ref='refs/heads/beta'), api.platform('mac', 64) + api.properties( + git_branch='beta', + clobber=True, + config_name='build_config.json', + ), api.monorepo.ci_build(git_ref='refs/heads/beta'), + api.platform('mac', 64) ) yield api.test( 'monorepo', api.repo_util.flutter_environment_data(), - api.monorepo.ci_build() + api.properties(config_name='build_config.json',), api.monorepo.ci_build() ) yield api.test( 'monorepo_tryjob', api.repo_util.flutter_environment_data(), - api.properties(clobber=True), api.monorepo.try_build() + api.properties( + clobber=True, + config_name='build_config.json', + ), api.monorepo.try_build() ) yield api.test( 'monorepo_wrong_host', api.repo_util.flutter_environment_data(), @@ -258,7 +267,10 @@ yield api.test( 'monorepo_first_bot_update_failed', api.repo_util.flutter_environment_data(), - api.properties(clobber=True), + api.properties( + clobber=True, + config_name='build_config.json', + ), api.monorepo.ci_build(), # Next line force a fail condition for the bot update # first execution. @@ -268,14 +280,16 @@ api.test( 'bot_update', api.properties( + config_name='build_config.json', git_url='https://github.com/flutter/engine', - git_ref='refs/pull/1/head' + git_ref='refs/pull/1/head', ) ) + api.repo_util.flutter_environment_data() ) yield api.test( 'first_bot_update_failed', api.properties( + config_name='build_config.json', git_url='https://github.com/flutter/engine', git_ref='refs/pull/1/head' ), @@ -287,6 +301,7 @@ yield api.test( 'first_bot_update_revision_not_found', api.properties( + config_name='build_config.json', git_url='https://github.com/flutter/engine', git_ref='refs/pull/1/head' ),
diff --git a/recipe_modules/shard_util/api.py b/recipe_modules/shard_util/api.py index 075861d..4c572e1 100644 --- a/recipe_modules/shard_util/api.py +++ b/recipe_modules/shard_util/api.py
@@ -276,16 +276,8 @@ change_url = f'{project_url}/+/{change.change}/{change.patchset}' led_data = led_data.then('edit-cr-cl', change_url) launch_res = led_data.then('launch', '-modernize', '-real-build') - # real-build is being used and only build_id is being populated - task_id = launch_res.launch_result.task_id or launch_res.launch_result.build_id - build_url_swarming = 'https://ci.chromium.org/swarming/task/%s?server=%s' % ( - task_id, - launch_res.launch_result.swarming_hostname, - ) - build_url_bb = 'https://%s/build/%s' % ( - launch_res.launch_result.buildbucket_hostname, task_id - ) - build_url = build_url_swarming if launch_res.launch_result.task_id else build_url_bb + task_id = launch_res.launch_result.build_id + build_url = launch_res.launch_result.build_url results[task_name] = SubbuildResult( builder=task_name, build_id=task_id,
diff --git a/recipe_modules/subbuild/api.py b/recipe_modules/subbuild/api.py index 87af929..b114ed4 100644 --- a/recipe_modules/subbuild/api.py +++ b/recipe_modules/subbuild/api.py
@@ -174,15 +174,8 @@ led_data = led_data.then("edit-cr-cl", edit_cr_cl_arg) led_data = self.m.led.inject_input_recipes(led_data) launch_res = led_data.then("launch", "-modernize", "-real-build") - task_id = launch_res.launch_result.task_id or launch_res.launch_result.build_id - build_url_swarming = 'https://ci.chromium.org/swarming/task/%s?server=%s' % ( - task_id, - launch_res.launch_result.swarming_hostname, - ) - build_url_bb = 'https://%s/build/%s' % ( - launch_res.launch_result.buildbucket_hostname, task_id - ) - build_url = build_url_swarming if launch_res.launch_result.task_id else build_url_bb + task_id = launch_res.launch_result.build_id + build_url = launch_res.launch_result.build_url builds[builder_name] = SubbuildResult( builder=builder_name, build_id=task_id, url=build_url )
diff --git a/recipe_modules/swarming_retry/api.py b/recipe_modules/swarming_retry/api.py index e1dc333..84b8397 100644 --- a/recipe_modules/swarming_retry/api.py +++ b/recipe_modules/swarming_retry/api.py
@@ -339,16 +339,9 @@ ) res = self._led_data.then("launch", "-real-build") - host = res.launch_result.swarming_hostname - task_id = res.launch_result.task_id or str(res.launch_result.build_id) - build_url_swarming = 'https://ci.chromium.org/swarming/task/%s?server=%s' % ( - task_id, - res.launch_result.swarming_hostname, - ) - build_url_bb = 'https://%s/build/%s' % ( - res.launch_result.buildbucket_hostname, task_id - ) - build_url = build_url_swarming if res.launch_result.task_id else build_url_bb + host = res.launch_result.buildbucket_hostname + task_id = str(res.launch_result.build_id) + build_url = res.launch_result.build_url return self._api.swarming_retry.Attempt( host=host, task_id=task_id,
diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json index 050d27b..35de7a0 100644 --- a/recipes/engine_v2/builder.expected/basic.json +++ b/recipes/engine_v2/builder.expected/basic.json
@@ -3293,8 +3293,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -3309,7 +3309,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -3443,7 +3443,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/config_file.json b/recipes/engine_v2/builder.expected/config_file.json index b299b8e..4375052 100644 --- a/recipes/engine_v2/builder.expected/config_file.json +++ b/recipes/engine_v2/builder.expected/config_file.json
@@ -295,7 +295,9 @@ }, "name": "Read build config file", "~followup_annotations": [ - "@@@STEP_LOG_LINE@abc.json@{}@@@", + "@@@STEP_LOG_LINE@abc.json@{@@@", + "@@@STEP_LOG_LINE@abc.json@ \"name\": \"flutter/build\"@@@", + "@@@STEP_LOG_LINE@abc.json@}@@@", "@@@STEP_LOG_END@abc.json@@@" ] }, @@ -642,8 +644,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -658,7 +660,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -792,7 +794,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json index 17cc73a..d1addff 100644 --- a/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json +++ b/recipes/engine_v2/builder.expected/dart-internal-flutter-success.json
@@ -5045,8 +5045,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -5061,7 +5061,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -5195,7 +5195,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/mac_main.json b/recipes/engine_v2/builder.expected/mac_main.json index d34d10d..3ec8bfd 100644 --- a/recipes/engine_v2/builder.expected/mac_main.json +++ b/recipes/engine_v2/builder.expected/mac_main.json
@@ -4119,8 +4119,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -4135,7 +4135,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -4269,7 +4269,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/mac_release_candidate.json b/recipes/engine_v2/builder.expected/mac_release_candidate.json index 32a0ac1..622d83a 100644 --- a/recipes/engine_v2/builder.expected/mac_release_candidate.json +++ b/recipes/engine_v2/builder.expected/mac_release_candidate.json
@@ -5836,8 +5836,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -5852,7 +5852,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -5986,7 +5986,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json index 37eef23..7fff42c 100644 --- a/recipes/engine_v2/builder.expected/monorepo.json +++ b/recipes/engine_v2/builder.expected/monorepo.json
@@ -2908,8 +2908,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/engine/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/engine/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -2924,7 +2924,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -3058,7 +3058,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json index 0979ab7..8494003 100644 --- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json +++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
@@ -2957,8 +2957,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/engine/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/engine/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -2973,7 +2973,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -3107,7 +3107,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json b/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json index a802db2..e74fb9f 100644 --- a/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json +++ b/recipes/engine_v2/builder.expected/test_if_not_skip_postsubmit.json
@@ -1003,8 +1003,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -1019,7 +1019,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -1153,7 +1153,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json b/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json index de112dc..50c8ce3 100644 --- a/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json +++ b/recipes/engine_v2/builder.expected/test_if_not_skip_presubmit.json
@@ -1003,8 +1003,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -1019,7 +1019,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -1153,7 +1153,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json b/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json index 8706ea4..5a6e2b0 100644 --- a/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json +++ b/recipes/engine_v2/builder.expected/test_if_skip_postsubmit.json
@@ -418,8 +418,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -434,7 +434,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -568,7 +568,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json b/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json index 2102073..bd6e637 100644 --- a/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json +++ b/recipes/engine_v2/builder.expected/test_if_skip_presubmit.json
@@ -528,8 +528,8 @@ "--json-output", "/path/to/tmp/json", "copytree", - "[CACHE]/builder/src/out", - "[CLEANUP]/out-cas-directory_tmp_1" + "[CACHE]/builder/src/out/flutter/build", + "[CLEANUP]/out-cas-directory_tmp_1/flutter/build" ], "infra_step": true, "luci_context": { @@ -544,7 +544,7 @@ "hostname": "rdbhost" } }, - "name": "Copy None" + "name": "Copy flutter/build" }, { "cmd": [ @@ -678,7 +678,7 @@ "hostname": "rdbhost" } }, - "name": "Archive full build for None", + "name": "Archive full build for flutter/build", "timeout": 900.0, "~followup_annotations": [ "@@@STEP_LINK@CAS UI@https://cas-viewer.appspot.com/projects/example-cas-server/instances/default_instance/blobs/e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855/0/tree@@@"
diff --git a/recipes/engine_v2/builder.py b/recipes/engine_v2/builder.py index afc29a6..551a2b9 100644 --- a/recipes/engine_v2/builder.py +++ b/recipes/engine_v2/builder.py
@@ -356,6 +356,8 @@ ] }], "gn": ["--ios", "--rbe"], + "name": + "flutter/build", "ninja": { "config": "ios_debug", "targets": [] @@ -479,6 +481,8 @@ ), ) test_if_build = { + "name": + "flutter/build", "tests": [{ "name": "mytest", "script": "myscript.sh",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json index be92215..bd28572 100644 --- a/recipes/firebaselab/firebaselab.expected/failure 10.json +++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -227,7 +227,7 @@ "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure", "/path/to/tmp/" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -273,7 +273,7 @@ "0o777", "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -311,7 +311,7 @@ "-json-output", "/path/to/tmp/json" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -356,7 +356,7 @@ "project", "flutter-infra-staging" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -389,7 +389,7 @@ "--target-platform", "android-arm,android-arm64" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -427,11 +427,11 @@ "--timeout", "2m", "--results-bucket=gs://flutter_firebase_testlab_staging", - "--results-dir=None/fake-task-id", + "--results-dir=the_task/fake-task-id", "--device", "model=redfin,version=30" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
diff --git a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json index f03140b..02fe3fa 100644 --- a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json +++ b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
@@ -229,7 +229,7 @@ "RECIPE_MODULE[fuchsia::gcloud]/resources/cipd.ensure", "/path/to/tmp/" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -275,7 +275,7 @@ "0o777", "[START_DIR]/cipd_tool/infra/3pp/tools/gcloud/0e548aa33f8113a45a5b3b62201e114e98e63d00f97296912380138f44597b07" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -313,7 +313,7 @@ "-json-output", "/path/to/tmp/json" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -358,7 +358,7 @@ "project", "flutter-infra-staging" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -391,7 +391,7 @@ "--target-platform", "android-arm,android-arm64" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -429,11 +429,11 @@ "--timeout", "2m", "--results-bucket=gs://flutter_firebase_testlab_staging", - "--results-dir=None/fake-task-id", + "--results-dir=the_task/fake-task-id", "--device", "model=redfin,version=30" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -472,11 +472,11 @@ "--timeout", "2m", "--results-bucket=gs://flutter_firebase_testlab_staging", - "--results-dir=None/fake-task-id", + "--results-dir=the_task/fake-task-id", "--device", "model=redfin,version=30" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -515,11 +515,11 @@ "--timeout", "2m", "--results-bucket=gs://flutter_firebase_testlab_staging", - "--results-dir=None/fake-task-id", + "--results-dir=the_task/fake-task-id", "--device", "model=redfin,version=30" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -553,10 +553,10 @@ "RECIPE_REPO[depot_tools]/gsutil.py", "----", "cp", - "gs://flutter_firebase_testlab_staging/None/fake-task-id/*/logcat", + "gs://flutter_firebase_testlab_staging/the_task/fake-task-id/*/logcat", "[CLEANUP]" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -592,7 +592,7 @@ "[CLEANUP]/logcat", "/path/to/tmp/" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", @@ -624,7 +624,7 @@ "E/flutter", "[CLEANUP]/logcat" ], - "cwd": "[START_DIR]/flutter/dev/integration_tests", + "cwd": "[START_DIR]/flutter/dev/integration_tests/the_task", "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
diff --git a/recipes/firebaselab/firebaselab.py b/recipes/firebaselab/firebaselab.py index c08bdff..cfbd7ea 100644 --- a/recipes/firebaselab/firebaselab.py +++ b/recipes/firebaselab/firebaselab.py
@@ -179,7 +179,10 @@ yield api.test( 'succeed_on_infra_failure', api.repo_util.flutter_environment_data(), - api.properties(physical_devices=physical_devices), + api.properties( + physical_devices=physical_devices, + task_name='the_task', + ), api.step_data('test_execution.gcloud firebase', retcode=15), api.step_data('test_execution.gcloud firebase (2)', retcode=15), api.step_data('test_execution.gcloud firebase (3)', retcode=15), @@ -188,7 +191,10 @@ yield api.test( 'failure 10', api.repo_util.flutter_environment_data(), - api.properties(physical_devices=physical_devices), + api.properties( + physical_devices=physical_devices, + task_name='the_task', + ), api.step_data('test_execution.gcloud firebase', retcode=10), status='FAILURE' )