Manual roll of recipes.
Recipe rolls have been failing for some time. This CL is to unblock
autorolls.
Change-Id: I462eb8e96f86c82d2da5761fe25237f76f3cbedf
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/34801
Reviewed-by: Ricardo Amador <ricardoamador@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-by: Nehal Patel <nehalvpatel@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 49d3d7b..e8df256 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -25,17 +25,17 @@
"deps": {
"depot_tools": {
"branch": "refs/heads/main",
- "revision": "cec7295ab0376d5825805871466d4e8f7c029a3b",
+ "revision": "77355b7fe2b4a494cd785b6621d06880955c2816",
"url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
},
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "667b1f9f7f13ab6f1cf2a2597c50565ef99aadd6",
+ "revision": "9284fd1e959cebeda96a251fd2bae4530bcbc51f",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
"branch": "refs/heads/main",
- "revision": "0cfa0e6e5b06a87c5b9de3f392158f721154b10a",
+ "revision": "d24cde52d4ffb9afa6e8b147ff4eb9f0249529fc",
"url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
}
},
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 3d031bb..a0c4766 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
@@ -650,6 +650,25 @@
"@@@STEP_LOG_LINE@proto.output@ \"project\": \"proj\"@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"infra\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"buildbucket\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"agent\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"input\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"data\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"kitchen-checkout\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cas\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"digest\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"size_bytes\": \"91\"@@@",
+ "@@@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@ \"purposes\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"swarming\": {@@@",
"@@@STEP_LOG_LINE@proto.output@ \"priority\": -20@@@",
"@@@STEP_LOG_LINE@proto.output@ }@@@",
@@ -752,12 +771,6 @@
"@@@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@ \"cas_user_payload\": {@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"digest\": {@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"size_bytes\": \"91\"@@@",
- "@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@}@@@",
"@@@STEP_LOG_END@proto.output@@@"
@@ -782,7 +795,7 @@
}
},
"name": "launch builds.led launch",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder\",\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 \"dependencies\": [\n {\n \"dependency\": \"android_sdk\"\n },\n {\n \"dependency\": \"chrome_and_driver\"\n }\n ],\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 \"cas_user_payload\": {\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": \"91\"\n }\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"custom drone builder\",\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 \"dependencies\": [\n {\n \"dependency\": \"android_sdk\"\n },\n {\n \"dependency\": \"chrome_and_driver\"\n }\n ],\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@{@@@",
@@ -1853,6 +1866,25 @@
"@@@STEP_LOG_LINE@proto.output@ \"project\": \"proj\"@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"infra\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"buildbucket\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"agent\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"input\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"data\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"kitchen-checkout\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"cas\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"digest\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"size_bytes\": \"91\"@@@",
+ "@@@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@ \"purposes\": {@@@",
+ "@@@STEP_LOG_LINE@proto.output@ \"kitchen-checkout\": \"PURPOSE_EXE_PAYLOAD\"@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ }@@@",
+ "@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"swarming\": {@@@",
"@@@STEP_LOG_LINE@proto.output@ \"priority\": -20@@@",
"@@@STEP_LOG_LINE@proto.output@ }@@@",
@@ -1962,12 +1994,6 @@
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ },@@@",
"@@@STEP_LOG_LINE@proto.output@ \"name\": \"felt_test\"@@@",
- "@@@STEP_LOG_LINE@proto.output@ },@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"cas_user_payload\": {@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"digest\": {@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",@@@",
- "@@@STEP_LOG_LINE@proto.output@ \"size_bytes\": \"91\"@@@",
- "@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@ }@@@",
"@@@STEP_LOG_LINE@proto.output@}@@@",
"@@@STEP_LOG_END@proto.output@@@"
@@ -1992,7 +2018,7 @@
}
},
"name": "launch builds (2).led launch",
- "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"Linux Engine Drone\",\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 \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"resolved_deps\": [\n {\n \"ios_debug\": \"bcd\",\n \"web_tests\": \"abc\"\n }\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n },\n \"dependencies\": [\n {\n \"dependency\": \"android_sdk\"\n },\n {\n \"dependency\": \"chrome_and_driver\"\n }\n ],\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/tester\",\n \"task_name\": \"felt_test\",\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\": \"felt_test\"\n },\n \"cas_user_payload\": {\n \"digest\": {\n \"hash\": \"146d56311043bb141309968d570e23d05a108d13ce2e20b5aeb40a9b95629b3e\",\n \"size_bytes\": \"91\"\n }\n }\n}",
+ "stdin": "{\n \"buildbucket\": {\n \"bbagent_args\": {\n \"build\": {\n \"builder\": {\n \"bucket\": \"try\",\n \"builder\": \"Linux Engine Drone\",\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 \"dependencies\": [\n \"ios_debug\"\n ],\n \"name\": \"felt_test\",\n \"parameters\": [\n \"test\"\n ],\n \"resolved_deps\": [\n {\n \"ios_debug\": \"bcd\",\n \"web_tests\": \"abc\"\n }\n ],\n \"scripts\": [\n \"out/script.sh\"\n ]\n },\n \"dependencies\": [\n {\n \"dependency\": \"android_sdk\"\n },\n {\n \"dependency\": \"chrome_and_driver\"\n }\n ],\n \"environment\": \"Staging\",\n \"git_ref\": \"refs/123/master\",\n \"git_url\": \"http://abc\",\n \"recipe\": \"engine_v2/tester\",\n \"task_name\": \"felt_test\",\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\": \"felt_test\"\n }\n}",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
"@@@STEP_LOG_LINE@json.output@{@@@",
diff --git a/recipes/contrib/salt_packer.expected/try_success.json b/recipes/contrib/salt_packer.expected/try_success.json
index 2cd4ccb..719e29d 100644
--- a/recipes/contrib/salt_packer.expected/try_success.json
+++ b/recipes/contrib/salt_packer.expected/try_success.json
@@ -1380,7 +1380,7 @@
}
},
"name": "checkout.git rebase",
- "timeout": 60.0,
+ "timeout": 600.0,
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/update.json b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
index abb18841..262044a 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/update.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
@@ -1186,7 +1186,7 @@
"git",
"commit",
"-m",
- "Rolling Salt Packer Base Images:\n\nbar: old -> new\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCq-Cl-Tag: roller-builder:builder\nCq-Cl-Tag: roller-bid:8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
+ "Rolling Salt Packer Base Images:\n\nbar: old -> new\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
"-a"
],
"cwd": "[START_DIR]/dash-internal-salt",
diff --git a/recipes/infra/ci_yaml.expected/basic.json b/recipes/infra/ci_yaml.expected/basic.json
index e384662..3554c15 100644
--- a/recipes/infra/ci_yaml.expected/basic.json
+++ b/recipes/infra/ci_yaml.expected/basic.json
@@ -1211,7 +1211,7 @@
"git",
"commit",
"-m",
- "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCq-Cl-Tag: roller-builder:builder\nCq-Cl-Tag: roller-bid:8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
+ "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
"-a"
],
"cwd": "[START_DIR]/infra",
diff --git a/recipes/infra/ci_yaml.expected/release.json b/recipes/infra/ci_yaml.expected/release.json
index 171fd73..0e585e4 100644
--- a/recipes/infra/ci_yaml.expected/release.json
+++ b/recipes/infra/ci_yaml.expected/release.json
@@ -1211,7 +1211,7 @@
"git",
"commit",
"-m",
- "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCq-Cl-Tag: roller-builder:builder\nCq-Cl-Tag: roller-bid:8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
+ "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
"-a"
],
"cwd": "[START_DIR]/infra",
diff --git a/recipes/infra/ci_yaml.expected/staging.json b/recipes/infra/ci_yaml.expected/staging.json
index 5de496f..bab2a0d 100644
--- a/recipes/infra/ci_yaml.expected/staging.json
+++ b/recipes/infra/ci_yaml.expected/staging.json
@@ -1211,7 +1211,7 @@
"git",
"commit",
"-m",
- "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCq-Cl-Tag: roller-builder:builder\nCq-Cl-Tag: roller-bid:8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
+ "Roll engine to abc123\n\nRoller-URL: https://ci.chromium.org/b/8945511751514863184\nCQ-Do-Not-Cancel-Tryjobs: true\nChange-Id: I28135185e8ac8c69d0b894c4be54ddbb0ea69d5c",
"-a"
],
"cwd": "[START_DIR]/infra",
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index db9f4c9..09a055c 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -1379,7 +1379,7 @@
}
},
"name": "checkout.git rebase",
- "timeout": 60.0,
+ "timeout": 600.0,
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index db9f4c9..09a055c 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -1379,7 +1379,7 @@
}
},
"name": "checkout.git rebase",
- "timeout": 60.0,
+ "timeout": 600.0,
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@"
]
