Revert "Increasing drone timeout if not running under goma."
This reverts commit 1c187ad045cca624a4b17ded65b34e4ac469ff4a.
Reason for revert: Potential failures: https://luci-milo.appspot.com/ui/p/dart-internal/builders/flutter/Linux%20release_builder/114/overview
Original change's description:
> Increasing drone timeout if not running under goma.
>
> When we do not run under goma, it increases the build
> times, so increasing timeout in those cases.
>
> Bug:b/232552448
> Change-Id: I9706ae59f665ce1148139d6131d06df5884690bf
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35520
> Reviewed-by: Godofredo Contreras <godofredoc@google.com>
> Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>
TBR=godofredoc@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,mohsinally@google.com
Change-Id: I5915842c02eab29c132efd9d6cb87a7d85982d50
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: b/232552448
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/35562
Reviewed-by: Xilai Zhang <xilaizhang@google.com>
Commit-Queue: Yusuf Mohsinally <mohsinally@google.com>
diff --git a/recipe_modules/shard_util_v2/api.py b/recipe_modules/shard_util_v2/api.py
index 1805a1d..9af267f 100644
--- a/recipe_modules/shard_util_v2/api.py
+++ b/recipe_modules/shard_util_v2/api.py
@@ -5,7 +5,6 @@
import attr
import collections
-from google.protobuf import duration_pb2
from recipe_engine import recipe_api
from recipe_engine import engine_types
from PB.go.chromium.org.luci.buildbucket.proto import common as common_pb2
@@ -270,8 +269,6 @@
priority=25,
exe_cipd_version=self.m.properties.get('exe_cipd_version', 'refs/heads/main')
)
- if drone_properties.get("no_goma", False):
- req.execution_timeout.FromSeconds(req.execution_timeout.ToSeconds() * 2)
reqs.append(req)
scheduled_builds = self.m.buildbucket.schedule(reqs, step_name="schedule")
results = {}
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 0895bd6..a302e4a 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\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"dimension1\", \"value\": \"abc\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"executionTimeout\": \"0s\", \"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\": []}}, \"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\", \"project\": \"fuchsia\"}, \"dimensions\": [{\"key\": \"dimension1\", \"value\": \"abc\"}], \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"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\": []}}, \"environment\": \"Staging\", \"git_ref\": \"refs/123/master\", \"git_url\": \"http://abc\", \"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@{@@@",
@@ -60,7 +60,6 @@
"@@@STEP_LOG_LINE@request@ \"exe\": {@@@",
"@@@STEP_LOG_LINE@request@ \"cipdVersion\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
- "@@@STEP_LOG_LINE@request@ \"executionTimeout\": \"0s\", @@@",
"@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@",
"@@@STEP_LOG_LINE@request@ \"experiments\": {@@@",
"@@@STEP_LOG_LINE@request@ \"luci.buildbucket.parent_tracking\": false@@@",
@@ -99,7 +98,6 @@
"@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\", @@@",
"@@@STEP_LOG_LINE@request@ \"git_ref\": \"refs/123/master\", @@@",
"@@@STEP_LOG_LINE@request@ \"git_url\": \"http://abc\", @@@",
- "@@@STEP_LOG_LINE@request@ \"no_goma\": \"true\", @@@",
"@@@STEP_LOG_LINE@request@ \"recipe\": \"engine_v2/builder\", @@@",
"@@@STEP_LOG_LINE@request@ \"task_name\": \"mytask\", @@@",
"@@@STEP_LOG_LINE@request@ \"tests\": [@@@",
diff --git a/recipe_modules/shard_util_v2/examples/full.py b/recipe_modules/shard_util_v2/examples/full.py
index d1cf361..3813455 100644
--- a/recipe_modules/shard_util_v2/examples/full.py
+++ b/recipe_modules/shard_util_v2/examples/full.py
@@ -126,7 +126,6 @@
presubmit_props_bb['git_url'] = 'http://abc'
presubmit_props_bb['git_ref'] = 'refs/123/master'
presubmit_props_bb['builds'][0]['drone_builder_name'] = 'custom drone builder'
- presubmit_props_bb['no_goma'] = 'true'
yield (
api.buildbucket_util.test("presubmit_bb", tryjob=True, status="failure") +
