Pass ci.yaml dimensions to builds.
Dimensions were not being passed correctly to subbuilds. This CL has
several fixes to ensure dimensions are propagated correctly.
Bug: https://github.com/flutter/flutter/issues/116794
Change-Id: Ib51468d14a625c29d0819c1af262f1b6abf93f53
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/37140
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Jesse Seales <jseales@google.com>
Reviewed-by: Drew Roen <drewroen@google.com>
diff --git a/recipe_modules/repo_util/api.py b/recipe_modules/repo_util/api.py
index 12b32f5..60a66d6 100644
--- a/recipe_modules/repo_util/api.py
+++ b/recipe_modules/repo_util/api.py
@@ -17,14 +17,16 @@
# TODO(keyonghan): deprecate when all repos are migrated to main.
REPO_BRANCHES = {
- 'flutter': 'master',
- 'engine': 'main',
'cocoon': 'main',
+ 'engine': 'main',
+ 'flutter': 'master',
'infra': 'main',
+ 'mirrors/engine': 'main',
+ 'mirrors/flutter': 'main',
'monorepo': 'main',
+ 'openpay': 'main',
'packages': 'main',
'plugins': 'main',
- 'openpay': 'main',
}
import copy
diff --git a/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json b/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
index 6f853bd..f7c7eb8 100644
--- a/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
+++ b/recipe_modules/repo_util/examples/full.expected/monorepo_wrong_host.json
@@ -1165,7 +1165,7 @@
"Traceback (most recent call last):",
" File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/examples/full.py\", line 48, in RunSteps",
" api.repo_util.monorepo_checkout(checkout_path, {}, {})",
- " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 149, in monorepo_checkout",
+ " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 151, in monorepo_checkout",
" raise ValueError(",
"ValueError('Input reference is not on dart.googlesource.com/monorepo')"
]
diff --git a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
index 4dcd299..cfedb07 100644
--- a/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
+++ b/recipe_modules/repo_util/examples/unsupported.expected/unsupported.json
@@ -9,7 +9,7 @@
"Traceback (most recent call last):",
" File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/examples/unsupported.py\", line 13, in RunSteps",
" api.repo_util.checkout('unsupported_repo', repo_dir)",
- " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 223, in checkout",
+ " File \"RECIPE_REPO[flutter]/recipe_modules/repo_util/api.py\", line 225, in checkout",
" raise ValueError('Unsupported repo: %s' % name)",
"ValueError('Unsupported repo: unsupported_repo')"
]
diff --git a/recipe_modules/shard_util_v2/api.py b/recipe_modules/shard_util_v2/api.py
index 887f505..1ea5162 100644
--- a/recipe_modules/shard_util_v2/api.py
+++ b/recipe_modules/shard_util_v2/api.py
@@ -189,7 +189,8 @@
drone_properties.pop('builds', None)
# Copy parent bot dimensions.
drone_dimensions = build.get('drone_dimensions', [])
- task_dimensions = []
+ # ci.yaml provided dimensions.
+ ci_yaml_dimensions = build.get('dimensions', {})
platform_name = build.get('platform') or PLATFORM_TO_NAME.get(
self.m.platform.name
)
@@ -206,26 +207,28 @@
builder_name = '%s%s' % (builder_name, suffix)
parent = self.m.buildbucket.build.builder
led_data = self.m.led(
- "get-builder",
+ 'get-builder',
'-real-build',
- "luci.%s.%s:%s" % (parent.project, parent.bucket, builder_name),
+ 'luci.%s.%s:%s' % (parent.project, parent.bucket, builder_name),
)
edit_args = []
for k, v in sorted(drone_properties.items()):
- edit_args.extend(["-p", "%s=%s" % (k, self.m.json.dumps(v))])
+ edit_args.extend(['-p', '%s=%s' % (k, self.m.json.dumps(v))])
# led reduces the priority of tasks by 10 from their values in
# buildbucket which we do not want.
# TODO(crbug.com/1138533) Add an option to led to handle this.
led_data.result.buildbucket.bbagent_args.build.infra.swarming.priority -= 20
- led_data = led_data.then("edit", *edit_args)
- led_data = led_data.then("edit", "-name", task_name)
- led_data = led_data.then("edit", "-r", recipe_name)
+ led_data = led_data.then('edit', *edit_args)
+ led_data = led_data.then('edit', '-name', task_name)
+ led_data = led_data.then('edit', '-r', recipe_name)
for d in drone_dimensions:
- led_data = led_data.then("edit", "-d", d)
+ led_data = led_data.then('edit', '-d', d)
+ for k,v in ci_yaml_dimensions.items():
+ led_data = led_data.then('edit', "-d", '%s=%s' % (k,v))
led_data = self.m.led.inject_input_recipes(led_data)
- launch_res = led_data.then("launch", "-modernize")
+ launch_res = led_data.then('launch', '-modernize')
task_id = launch_res.launch_result.task_id
- build_url = "https://ci.chromium.org/swarming/task/%s?server=%s" % (
+ build_url = 'https://ci.chromium.org/swarming/task/%s?server=%s' % (
task_id,
launch_res.launch_result.swarming_hostname,
)
@@ -259,6 +262,8 @@
drone_properties['build'] = build
# Copy parent bot dimensions.
drone_dimensions = build.get('drone_dimensions', [])
+ # ci.yaml provided dimensions.
+ ci_yaml_dimensions = build.get('dimensions', {})
task_dimensions = []
platform_name = build.get('platform') or PLATFORM_TO_NAME.get(
self.m.platform.name
@@ -276,6 +281,8 @@
for d in drone_dimensions:
k, v = d.split('=')
task_dimensions.append(common_pb2.RequestedDimension(key=k, value=v))
+ for k,v in ci_yaml_dimensions.items():
+ task_dimensions.append(common_pb2.RequestedDimension(key=k, value=v))
# Override recipe.
drone_properties['recipe'] = recipe_name
properties = collections.OrderedDict(
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
index b03527e..6e0b4fa 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_bb.json
@@ -24,7 +24,7 @@
}
},
"name": "launch builds.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"custom drone builder-try\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"dimension1\", \"value\": \"abc\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"executionTimeout\": \"7200s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"priority\": 25, \"properties\": {\"build\": {\"drone_builder_name\": \"custom drone builder\", \"drone_dimensions\": [\"dimension1=abc\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}}, \"builder_name_suffix\": \"-try\", \"environment\": \"Staging\", \"git_ref\": \"refs/123/master\", \"git_url\": \"http://abc\", \"no_goma\": \"true\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"custom drone builder-try\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"dimension1\", \"value\": \"abc\"}, {\"key\": \"cpu\", \"value\": \"arm64\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"executionTimeout\": \"7200s\", \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"fuchsia-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"fuchsia\"}], \"priority\": 25, \"properties\": {\"build\": {\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_builder_name\": \"custom drone builder\", \"drone_dimensions\": [\"dimension1=abc\"], \"generators\": [{\"name\": \"generator1\", \"script\": \"script1.sh\"}], \"gn\": [\"--ios\"], \"name\": \"ios_debug\", \"ninja\": {\"config\": \"ios_debug\", \"targets\": []}}, \"builder_name_suffix\": \"-try\", \"environment\": \"Staging\", \"git_ref\": \"refs/123/master\", \"git_url\": \"http://abc\", \"no_goma\": \"true\", \"recipe\": \"engine_v2/builder\", \"task_name\": \"mytask\", \"tests\": [{\"dependencies\": [\"ios_debug\"], \"name\": \"felt_test\", \"parameters\": [\"test\"], \"scripts\": [\"out/script.sh\"]}]}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -55,6 +55,10 @@
"@@@STEP_LOG_LINE@request@ {@@@",
"@@@STEP_LOG_LINE@request@ \"key\": \"dimension1\", @@@",
"@@@STEP_LOG_LINE@request@ \"value\": \"abc\"@@@",
+ "@@@STEP_LOG_LINE@request@ }, @@@",
+ "@@@STEP_LOG_LINE@request@ {@@@",
+ "@@@STEP_LOG_LINE@request@ \"key\": \"cpu\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"value\": \"arm64\"@@@",
"@@@STEP_LOG_LINE@request@ }@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"exe\": {@@@",
@@ -77,6 +81,9 @@
"@@@STEP_LOG_LINE@request@ \"priority\": 25, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@request@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@request@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"drone_builder_name\": \"custom drone builder\", @@@",
"@@@STEP_LOG_LINE@request@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@request@ \"dimension1=abc\"@@@",
diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
index ea25ab8..6c81783 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
@@ -50,7 +50,7 @@
"-p",
"$recipe_engine/led={\"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\", \"rbe_cas_input\": {\"cas_instance\": \"projects/chromium-swarm/instances/default_instance\", \"digest\": {\"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\", \"size_bytes\": 91}}}",
"-p",
- "build={\"drone_builder_name\": \"custom drone builder\", \"drone_dimensions\": [\"dimension1=abc\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"]}",
+ "build={\"dimensions\": {\"cpu\": \"arm64\"}, \"drone_builder_name\": \"custom drone builder\", \"drone_dimensions\": [\"dimension1=abc\"], \"gn\": [], \"name\": \"ios_debug\", \"ninja\": [\"ios_debug\"]}",
"-p",
"builder_name_suffix=\"-try\"",
"-p",
@@ -152,6 +152,9 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
@@ -211,7 +214,7 @@
}
},
"name": "launch builds.led edit (2)",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n }\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n }\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -284,6 +287,9 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
@@ -344,7 +350,7 @@
}
},
"name": "launch builds.led edit (3)",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -417,6 +423,9 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
@@ -477,7 +486,7 @@
}
},
"name": "launch builds.led edit (4)",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -550,6 +559,145 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ],@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"gn\": [],@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"name\": \"ios_debug\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"ninja\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"ios_debug\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ]@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"builder_name_suffix\": \"-try\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"environment\": \"Staging\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"git_ref\": \"refs/123/master\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"git_url\": \"http://abc\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"recipe\": \"engine_v2/builder\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"task_name\": \"ios_debug\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"tests\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dependencies\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"ios_debug\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ],@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"name\": \"felt_test\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"parameters\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"test\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ],@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"scripts\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"out/script.sh\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ]@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ]@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"name\": \"ios_debug\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@}@@@",
+ "@@@STEP_LOG_END@proto.output@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "led",
+ "edit",
+ "-d",
+ "cpu=arm64"
+ ],
+ "luci_context": {
+ "realm": {
+ "name": "proj:try"
+ },
+ "resultdb": {
+ "current_invocation": {
+ "name": "invocations/build:8945511751514863184",
+ "update_token": "token"
+ },
+ "hostname": "rdbhost"
+ }
+ },
+ "name": "launch builds.led edit (5)",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
+ "~followup_annotations": [
+ "@@@STEP_NEST_LEVEL@1@@@",
+ "@@@STEP_LOG_LINE@proto.output@{@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"buildbucket\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"bbagent_args\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"builder\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"bucket\": \"try\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"builder\": \"custom drone builder-try\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"project\": \"proj\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"infra\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"priority\": -20@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"input\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"properties\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"$recipe_engine/buildbucket\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"builder\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"bucket\": \"try\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"builder\": \"try-builder\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"project\": \"proj\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"createTime\": \"2018-05-25T23:50:17Z\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"createdBy\": \"project:proj\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"id\": \"8945511751514863184\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"infra\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"resultdb\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"invocation\": \"invocations/build:8945511751514863184\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"swarming\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"priority\": 30.0@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"input\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"gerritChanges\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"change\": \"123456\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"host\": \"github.com\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"patchset\": \"7\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"project\": \"repo/a\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ],@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"gitilesCommit\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"host\": \"github.com\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"project\": \"repo/a\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"ref\": \"refs/heads/main\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"number\": 123.0,@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"tags\": [@@@",
+ "@@@STEP_LOG_LINE@proto.output@ {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"key\": \"cq_experimental\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"value\": \"false\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ ]@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"$recipe_engine/led\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"rbe_cas_input\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"digest\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"size_bytes\": 91.0@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
@@ -609,8 +757,8 @@
"hostname": "rdbhost"
}
},
- "name": "launch builds.led edit (5)",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
+ "name": "launch builds.led edit (6)",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@proto.output@{@@@",
@@ -702,6 +850,9 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"build\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"dimensions\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cpu\": \"arm64\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_builder_name\": \"custom drone builder\",@@@",
"@@@STEP_LOG_LINE@proto.output@ \"drone_dimensions\": [@@@",
"@@@STEP_LOG_LINE@proto.output@ \"dimension1=abc\"@@@",
@@ -761,7 +912,7 @@
}
},
"name": "launch builds.led launch",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"buildbucket\": {\n \"agent\": {\n \"input\": {\n \"data\": {\n \"kitchen-checkout\": {\n \"cas\": {\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": \"91\"\n }\n }\n }\n }\n },\n \"purposes\": {\n \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n }\n }\n },\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder-try\",\n \"project\": \"proj\"\n },\n \"infra\": {\n \"buildbucket\": {\n \"agent\": {\n \"input\": {\n \"data\": {\n \"kitchen-checkout\": {\n \"cas\": {\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": \"91\"\n }\n }\n }\n }\n },\n \"purposes\": {\n \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"\n }\n }\n },\n \"swarming\": {\n \"priority\": -20\n }\n },\n \"input\": {\n \"properties\": {\n \"$recipe_engine/buildbucket\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"try-builder\",\n \"project\": \"proj\"\n },\n \"createTime\": \"2018-05-25T23:50:17Z\",\n \"createdBy\": \"project:proj\",\n \"id\": \"8945511751514863184\",\n \"infra\": {\n \"resultdb\": {\n \"invocation\": \"invocations/build:8945511751514863184\"\n },\n \"swarming\": {\n \"priority\": 30.0\n }\n },\n \"input\": {\n \"gerritChanges\": [\n {\n \"change\": \"123456\",\n \"host\": \"github.com\",\n \"patchset\": \"7\",\n \"project\": \"repo/a\"\n }\n ],\n \"gitilesCommit\": {\n \"host\": \"github.com\",\n \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\",\n \"project\": \"repo/a\",\n \"ref\": \"refs/heads/main\"\n }\n },\n \"number\": 123.0,\n \"tags\": [\n {\n \"key\": \"cq_experimental\",\n \"value\": \"false\"\n }\n ]\n }\n },\n \"$recipe_engine/led\": {\n \"led_run_id\": \"flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc\",\n \"rbe_cas_input\": {\n \"cas_instance\": \"projects/chromium-swarm/instances/default_instance\",\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": 91.0\n }\n }\n },\n \"build\": {\n \"dimensions\": {\n \"cpu\": \"arm64\"\n },\n \"drone_builder_name\": \"custom drone builder\",\n \"drone_dimensions\": [\n \"dimension1=abc\"\n ],\n \"gn\": [],\n \"name\": \"ios_debug\",\n \"ninja\": [\n \"ios_debug\"\n ]\n },\n \"builder_name_suffix\": \"-try\",\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/builder\",\n \"task_name\": \"ios_debug\",\n \"tests\": [\n {\n \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n }\n ]\n }\n }\n }\n },\n \"name\": \"ios_debug\"\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipe_modules/shard_util_v2/examples/full.py b/recipe_modules/shard_util_v2/examples/full.py
index df32c09..e11534a 100644
--- a/recipe_modules/shard_util_v2/examples/full.py
+++ b/recipe_modules/shard_util_v2/examples/full.py
@@ -45,53 +45,54 @@
def GenTests(api):
try_subbuild1 = api.shard_util_v2.try_build_message(
build_id=8945511751514863186,
- builder="ios_debug",
+ builder='ios_debug',
input_props={'task_name': 'mytask'},
output_props={
- "cas_output_hash": {"web_tests": "abc", "ios_debug": "bcd", "full_build": "123"}
+ 'cas_output_hash': {'web_tests': 'abc', 'ios_debug': 'bcd', 'full_build': '123'}
},
- status="SUCCESS",
+ status='SUCCESS',
)
try_subbuild2 = api.shard_util_v2.try_build_message(
build_id=8945511751514863187,
- builder="builder-subbuild2",
+ builder='builder-subbuild2',
output_props={
- "cas_output_hash": {"web_tests": "abc", "ios_debug": "bcd"}
+ 'cas_output_hash': {'web_tests': 'abc', 'ios_debug': 'bcd'}
},
- status="SUCCESS",
+ status='SUCCESS',
)
try_failure = api.shard_util_v2.try_build_message(
build_id=8945511751514863187,
- builder="builder-subbuild2",
+ builder='builder-subbuild2',
output_props={
- "cas_output_hash": {"web_tests": "abc", "ios_debug": "bcd"}
+ 'cas_output_hash': {'web_tests': 'abc', 'ios_debug': 'bcd'}
},
- status="FAILURE",
+ status='FAILURE',
)
props = {
'builds': [{
- "name": "ios_debug", "gn": [], "ninja": ["ios_debug"],
+ 'name': 'ios_debug', 'gn': [], 'ninja': ['ios_debug'],
+ 'dimensions': {'cpu': 'arm64'},
'drone_dimensions': ['dimension1=abc']
}],
'tests': [{
- "name": "felt_test", "dependencies": ["ios_debug"],
- "scripts": ["out/script.sh"], "parameters": ["test"]
+ 'name': 'felt_test', 'dependencies': ['ios_debug'],
+ 'scripts': ['out/script.sh'], 'parameters': ['test']
}],
'environment': 'Staging',
'builder_name_suffix': '-try',
- 'dependencies': [{"dependency": "android_sdk"},
- {"dependency": "chrome_and_driver"}],
+ 'dependencies': [{'dependency': 'android_sdk'},
+ {'dependency': 'chrome_and_driver'}],
'$recipe_engine/led': {
- "led_run_id":
- "flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc",
- "rbe_cas_input": {
- "cas_instance":
- "projects/chromium-swarm/instances/default_instance",
- "digest": {
- "hash":
- "146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e",
- "size_bytes":
+ 'led_run_id':
+ 'flutter/led/abc_google.com/b9861e3db1034eee460599837221ab468e03bc43f9fd05684a08157fd646abfc',
+ 'rbe_cas_input': {
+ 'cas_instance':
+ 'projects/chromium-swarm/instances/default_instance',
+ 'digest': {
+ 'hash':
+ '146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e',
+ 'size_bytes':
91
}
}
@@ -99,15 +100,16 @@
}
props_bb = {
'task_name': 'mytask', 'builds': [{
- "name": "ios_debug", "gn": ["--ios"],
- "ninja": {"config": "ios_debug",
- "targets": []}, 'drone_dimensions': ['dimension1=abc'],
- "generators": [{"name": "generator1", "script": "script1.sh"}]
+ 'name': 'ios_debug', 'gn': ['--ios'],
+ 'dimensions': {'cpu': 'arm64'},
+ 'ninja': {'config': 'ios_debug',
+ 'targets': []}, 'drone_dimensions': ['dimension1=abc'],
+ 'generators': [{'name': 'generator1', 'script': 'script1.sh'}]
}], 'tests': [{
- "name": "felt_test", "dependencies": ["ios_debug"],
- "scripts": ["out/script.sh"], "parameters": ["test"]
- }], 'dependencies': [{"dependency": "android_sdk"},
- {"dependency": "chrome_and_driver"}],
+ 'name': 'felt_test', 'dependencies': ['ios_debug'],
+ 'scripts': ['out/script.sh'], 'parameters': ['test']
+ }], 'dependencies': [{'dependency': 'android_sdk'},
+ {'dependency': 'chrome_and_driver'}],
'environment': 'Staging', 'builder_name_suffix': '-try'
}
@@ -128,7 +130,7 @@
),
api.shard_util_v2.child_led_steps(
subbuilds=[try_subbuild1, try_subbuild2],
- collect_step="collect builds",
+ collect_step='collect builds',
)
)
@@ -139,11 +141,11 @@
presubmit_props_bb['no_goma'] = 'true'
yield (
- api.buildbucket_util.test("presubmit_bb", tryjob=True, status="failure") +
+ api.buildbucket_util.test('presubmit_bb', tryjob=True, status='failure') +
api.properties(**presubmit_props_bb) + api.platform.name('linux') +
api.shard_util_v2.child_build_steps(
subbuilds=[try_failure],
- launch_step="launch builds",
- collect_step="collect builds",
+ launch_step='launch builds',
+ collect_step='collect builds',
)
)
diff --git a/recipes/packaging_v2/packaging_v2.py b/recipes/packaging_v2/packaging_v2.py
index 4d9cab0..67699f9 100644
--- a/recipes/packaging_v2/packaging_v2.py
+++ b/recipes/packaging_v2/packaging_v2.py
@@ -56,7 +56,7 @@
git_hash(str): Hash corresponding to git commit.
branch(str): Name of the flutter branch.
packaging_script(str): Script that will prepare, create and publish a flutter archive.
-"""
+ """
flutter_executable = 'flutter' if not api.platform.is_win else 'flutter.bat'
dart_executable = 'dart' if not api.platform.is_win else 'dart.exe'
work_dir = api.path['start_dir'].join('archive')
diff --git a/recipes/release/release_builder.py b/recipes/release/release_builder.py
index 301c980..b07dcfa 100644
--- a/recipes/release/release_builder.py
+++ b/recipes/release/release_builder.py
@@ -56,7 +56,7 @@
def RunSteps(api, properties, env_properties):
- repository = api.buildbucket.gitiles_commit.project
+ repository = api.properties.get('git_repo') or api.buildbucket.gitiles_commit.project
repository_parts = repository.split('/')
checkout_path = api.path['start_dir'].join(*repository_parts)
git_ref = api.properties.get('git_ref') or api.buildbucket.gitiles_commit.ref
