Support Dart SDK main branch in recipes and modules
Bug: b/198416551
Change-Id: Ifc70d2aa84cb10e3a26474d1ae7658b3615eee7a
Reviewed-on: https://dart-review.googlesource.com/c/recipes/+/212571
Commit-Queue: Alexander Thomas <athom@google.com>
Reviewed-by: William Hesse <whesse@google.com>
diff --git a/README.recipes.md b/README.recipes.md
index 337b423..937e51a 100644
--- a/README.recipes.md
+++ b/README.recipes.md
@@ -78,7 +78,7 @@
Checks out the dart code and prepares it for building.
-— **def [collect\_all](/recipe_modules/dart/api.py#330)(self, steps):**
+— **def [collect\_all](/recipe_modules/dart/api.py#333)(self, steps):**
Collects the results of a sharded test run.
@@ -86,7 +86,7 @@
Returns the path to the checked-in SDK dart executable.
-— **def [delete\_debug\_log](/recipe_modules/dart/api.py#699)(self):**
+— **def [delete\_debug\_log](/recipe_modules/dart/api.py#702)(self):**
Deletes the debug log file
@@ -94,7 +94,7 @@
Decrypts the specified secret and returns the location of the result
-— **def [has\_infra\_failure](/recipe_modules/dart/api.py#1263)(self, failure):**
+— **def [has\_infra\_failure](/recipe_modules/dart/api.py#1265)(self, failure):**
Returns whether failure is an aggregated failure that directly or
indirectly contains an InfraFailure.
@@ -103,7 +103,7 @@
Kills leftover tasks from previous runs or steps.
-— **def [read\_debug\_log](/recipe_modules/dart/api.py#687)(self):**
+— **def [read\_debug\_log](/recipe_modules/dart/api.py#690)(self):**
Reads the debug log file
@@ -112,7 +112,7 @@
Runs test.py in the given isolate, sharded over several swarming tasks.
Returns the created tasks, which can be collected with collect_all().
-— **def [test](/recipe_modules/dart/api.py#705)(self, test_data):**
+— **def [test](/recipe_modules/dart/api.py#708)(self, test_data):**
Reads the test-matrix.json file in the checkout and runs each step listed
in the file.
@@ -124,11 +124,11 @@
### *recipes* / [bisect\_build:tests/tests](/recipe_modules/bisect_build/tests/tests.py)
-[DEPS](/recipe_modules/bisect_build/tests/tests.py#16): [bisect\_build](#recipe_modules-bisect_build), [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipe_modules/bisect_build/tests/tests.py#17): [bisect\_build](#recipe_modules-bisect_build), [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
PYTHON_VERSION_COMPATIBILITY: PY2
-— **def [RunSteps](/recipe_modules/bisect_build/tests/tests.py#39)(api, current_failure, is_experimental):**
+— **def [RunSteps](/recipe_modules/bisect_build/tests/tests.py#40)(api, current_failure, is_experimental):**
### *recipes* / [build:tests/test\_build](/recipe_modules/build/tests/test_build.py)
[DEPS](/recipe_modules/build/tests/test_build.py#9): [build](#recipe_modules-build), [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
@@ -197,41 +197,41 @@
— **def [RunSteps](/recipes/dart/external.py#27)(api, properties):**
### *recipes* / [dart/flutter\_engine](/recipes/dart/flutter_engine.py)
-[DEPS](/recipes/dart/flutter_engine.py#16): [build/goma][build/recipe_modules/goma], [bisect\_build](#recipe_modules-bisect_build), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/depot\_tools][depot_tools/recipe_modules/depot_tools], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/dart/flutter_engine.py#17): [build/goma][build/recipe_modules/goma], [bisect\_build](#recipe_modules-bisect_build), [depot\_tools/bot\_update][depot_tools/recipe_modules/bot_update], [depot\_tools/depot\_tools][depot_tools/recipe_modules/depot_tools], [depot\_tools/gclient][depot_tools/recipe_modules/gclient], [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/json][recipe_engine/recipe_modules/json], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/platform][recipe_engine/recipe_modules/platform], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/runtime][recipe_engine/recipe_modules/runtime], [recipe\_engine/step][recipe_engine/recipe_modules/step]
PYTHON_VERSION_COMPATIBILITY: PY2
-— **def [AnalyzeDartUI](/recipes/dart/flutter_engine.py#79)(api, engine_src):**
+— **def [AnalyzeDartUI](/recipes/dart/flutter_engine.py#80)(api, engine_src):**
-— **def [Build](/recipes/dart/flutter_engine.py#62)(api, engine_src, config, \*targets):**
+— **def [Build](/recipes/dart/flutter_engine.py#63)(api, engine_src, config, \*targets):**
-— **def [BuildAndTest](/recipes/dart/flutter_engine.py#400)(api, start_dir, engine_src, flutter_rev):**
+— **def [BuildAndTest](/recipes/dart/flutter_engine.py#401)(api, start_dir, engine_src, flutter_rev):**
-— **def [BuildLinux](/recipes/dart/flutter_engine.py#112)(api, engine_src):**
+— **def [BuildLinux](/recipes/dart/flutter_engine.py#113)(api, engine_src):**
-— **def [BuildLinuxAndroidArm](/recipes/dart/flutter_engine.py#96)(api, engine_src):**
+— **def [BuildLinuxAndroidArm](/recipes/dart/flutter_engine.py#97)(api, engine_src):**
-— **def [BuildLinuxAndroidx86](/recipes/dart/flutter_engine.py#89)(api, engine_src):**
+— **def [BuildLinuxAndroidx86](/recipes/dart/flutter_engine.py#90)(api, engine_src):**
-— **def [CopyArtifacts](/recipes/dart/flutter_engine.py#192)(api, engine_src, cached_dest, file_paths):**
+— **def [CopyArtifacts](/recipes/dart/flutter_engine.py#193)(api, engine_src, cached_dest, file_paths):**
-— **def [GetCheckout](/recipes/dart/flutter_engine.py#138)(api, start_dir, engine_src):**
+— **def [GetCheckout](/recipes/dart/flutter_engine.py#139)(api, start_dir, engine_src):**
-— **def [KillTasks](/recipes/dart/flutter_engine.py#48)(api, engine_src, ok_ret='any'):**
+— **def [KillTasks](/recipes/dart/flutter_engine.py#49)(api, engine_src, ok_ret='any'):**
Kills leftover tasks from previous runs or steps.
-— **def [RunGN](/recipes/dart/flutter_engine.py#71)(api, engine_src, \*args):**
+— **def [RunGN](/recipes/dart/flutter_engine.py#72)(api, engine_src, \*args):**
-— **def [RunSteps](/recipes/dart/flutter_engine.py#370)(api):**
+— **def [RunSteps](/recipes/dart/flutter_engine.py#371)(api):**
-— **def [TestEngine](/recipes/dart/flutter_engine.py#84)(api, engine_src):**
+— **def [TestEngine](/recipes/dart/flutter_engine.py#85)(api, engine_src):**
-— **def [TestFlutter](/recipes/dart/flutter_engine.py#290)(api, start_dir, engine_src, just_built_dart_sdk):**
+— **def [TestFlutter](/recipes/dart/flutter_engine.py#291)(api, start_dir, engine_src, just_built_dart_sdk):**
-— **def [TestObservatory](/recipes/dart/flutter_engine.py#127)(api, engine_src):**
+— **def [TestObservatory](/recipes/dart/flutter_engine.py#128)(api, engine_src):**
-— **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#205)(api, flutter, engine_src):**
+— **def [UpdateCachedEngineArtifacts](/recipes/dart/flutter_engine.py#206)(api, flutter, engine_src):**
### *recipes* / [dart/forward\_branch](/recipes/dart/forward_branch.py)
[DEPS](/recipes/dart/forward_branch.py#8): [dart](#recipe_modules-dart), [depot\_tools/git][depot_tools/recipe_modules/git], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
@@ -255,11 +255,11 @@
— **def [RunSteps](/recipes/dart/linearize.py#24)(api):**
### *recipes* / [dart/neo](/recipes/dart/neo.py)
-[DEPS](/recipes/dart/neo.py#22): [bisect\_build](#recipe_modules-bisect_build), [dart](#recipe_modules-dart), [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [depot\_tools/osx\_sdk][depot_tools/recipe_modules/osx_sdk], [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
+[DEPS](/recipes/dart/neo.py#23): [bisect\_build](#recipe_modules-bisect_build), [dart](#recipe_modules-dart), [depot\_tools/gitiles][depot_tools/recipe_modules/gitiles], [depot\_tools/osx\_sdk][depot_tools/recipe_modules/osx_sdk], [depot\_tools/tryserver][depot_tools/recipe_modules/tryserver], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step]
PYTHON_VERSION_COMPATIBILITY: PY2
-— **def [RunSteps](/recipes/dart/neo.py#94)(api, properties):**
+— **def [RunSteps](/recipes/dart/neo.py#95)(api, properties):**
### *recipes* / [dart/package\_co19](/recipes/dart/package_co19.py)
[DEPS](/recipes/dart/package_co19.py#8): [depot\_tools/git][depot_tools/recipe_modules/git], [recipe\_engine/buildbucket][recipe_engine/recipe_modules/buildbucket], [recipe\_engine/cipd][recipe_engine/recipe_modules/cipd], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/step][recipe_engine/recipe_modules/step]
diff --git a/recipe_modules/bisect_build/test_api.py b/recipe_modules/bisect_build/test_api.py
index fb21954..9034a67 100644
--- a/recipe_modules/bisect_build/test_api.py
+++ b/recipe_modules/bisect_build/test_api.py
@@ -2,22 +2,18 @@
# source code is governed by a BSD-style license that can be found in the
# LICENSE file.
-from api import BisectApi
+from .api import BisectApi
from recipe_engine import recipe_test_api
-from google.protobuf import json_format
from google.protobuf.struct_pb2 import Struct
from PB.go.chromium.org.luci.buildbucket.proto import build as build_pb2
from PB.go.chromium.org.luci.buildbucket.proto import builder as builder_pb2
-from PB.go.chromium.org.luci.buildbucket.proto import builds_service as builds_service_pb2
-
class BisectBuildTestApi(recipe_test_api.RecipeTestApi):
def build(self,
- api,
builder_name,
build_number,
revision,
@@ -37,7 +33,7 @@
output=build_pb2.Build.Output(properties=properties),
)
- def fetch_previous_builds(self, api, builds, start_number=0):
+ def fetch_previous_builds(self, builds):
name = '%s.%s' % (BisectApi.FIND_BASE_BUILD_STEP_NAME,
BisectApi.FETCH_BUILDS_STEP_NAME)
- return api.buildbucket.simulated_search_results(builds, step_name=name)
+ return self.m.buildbucket.simulated_search_results(builds, step_name=name)
diff --git a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure-experimental.json b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure-experimental.json
index a287363..3530646 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure-experimental.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure-experimental.json
@@ -8,7 +8,7 @@
],
"infra_step": true,
"name": "schedule bisect (d)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"YES\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"YES\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -40,7 +40,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"d\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
diff --git a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure.json b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure.json
index 211488b..f3bc095 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-failure.json
@@ -8,7 +8,7 @@
],
"infra_step": true,
"name": "schedule bisect (d)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -40,7 +40,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"d\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
diff --git a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-success.json b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-success.json
index 358c289..2446909 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-success.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/continue-bisect-on-success.json
@@ -8,7 +8,7 @@
],
"infra_step": true,
"name": "schedule bisect (b)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"b\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"a\"], \"bisect_older\": [\"c\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"b\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"a\"], \"bisect_older\": [\"c\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -40,7 +40,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"b\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
diff --git a/recipe_modules/bisect_build/tests/tests.expected/fan-out-on-distinct-failure.json b/recipe_modules/bisect_build/tests/tests.expected/fan-out-on-distinct-failure.json
index f5c2536..73182b3 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/fan-out-on-distinct-failure.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/fan-out-on-distinct-failure.json
@@ -8,7 +8,7 @@
],
"infra_step": true,
"name": "schedule bisect (b)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"b\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"a\"], \"bisect_older\": [\"c\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"b\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"a\"], \"bisect_older\": [\"c\"], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -40,7 +40,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"b\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
@@ -78,7 +78,7 @@
],
"infra_step": true,
"name": "schedule bisect (d)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"different failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"d\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4711.0, \"bisect_newer\": [\"c\"], \"bisect_older\": [\"e\"], \"bisect_reason\": \"different failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -110,7 +110,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"d\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
diff --git a/recipe_modules/bisect_build/tests/tests.expected/start-experimental-bisection.json b/recipe_modules/bisect_build/tests/tests.expected/start-experimental-bisection.json
index 52dd3ff..0e04ae3 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/start-experimental-bisection.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/start-experimental-bisection.json
@@ -48,24 +48,24 @@
"@@@STEP_LOG_LINE@json.output@ \"log\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"bda185dc04d062d391039867ae671ac9133e9801\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"c0d0fdf8bcf7518bc25f8c76a85bf9a50d678529\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 0\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"faed5d85b02d45b884a6c84a69c198c120b36380\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"1f265dfbd3cf9ce15af541154c2e9db6b3ed5d58\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"a32438c6a72030d92b00f5eb682e7745338e6668\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"81bec21a953afebeee3f200ed6a68ea01758323b\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"1f944b71d6fcc086596ced8938eff992cbe4e326\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"d24cd35889c03794446a1766b10167c0e4de38e4\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"a.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -76,24 +76,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"8331c527346abecfe0ad081df241512bb4b7df50\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"a3f2abe0b084940abbd01f222ae55c0597c3a169\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"c50e65308b4d20210b14a612d2afb6acb3e830d9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"f8186661e3db6798c680c1a017908c35df82b57f\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"97cbb78571a53287bb1f64a5679f84c396df55ac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"c88db24d9c3932de7eccbcfd953927685e0ecdab\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"5e881d213594ff0042014750f2ad397eaaeebee4\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"c87d90745b6b84ae513ab3b5a9d6f49d4f72bf19\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"b.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -104,24 +104,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 2\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 2\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"73c504dc712dae16fdd38ba50db2a1c5a669cd22\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"95f8e67b7785ca4bd08e82a4807f8970869861db\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"5ae2afc02495c1adee6a3233581f73dac4f7a76a\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"2b78c14fc5b32c2d431d9bd833c14fbb9ec36cf5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"38952d2a55008e5afca8d49d8dd78c448d1a7c6c\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"4c627dd0f2bf21bf08d55ce6933ebd7ed2a08a5a\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"c.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -143,8 +143,8 @@
"cr-buildbucket.appspot.com"
],
"infra_step": true,
- "name": "schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"YES\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 2.0, \"bisect_newer\": [\"8331c527346abecfe0ad081df241512bb4b7df50\"], \"bisect_older\": [], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "name": "schedule bisect (67dba66cfa49c62e4a6b501e94997aa4a410fe42)",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"YES\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 2.0, \"bisect_newer\": [\"a3f2abe0b084940abbd01f222ae55c0597c3a169\"], \"bisect_older\": [], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -174,15 +174,15 @@
"@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bisect_base_build\": 2.0, @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_newer\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"8331c527346abecfe0ad081df241512bb4b7df50\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"a3f2abe0b084940abbd01f222ae55c0597c3a169\"@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_older\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_reason\": \"failure\", @@@",
diff --git a/recipe_modules/bisect_build/tests/tests.expected/starts bisection.json b/recipe_modules/bisect_build/tests/tests.expected/starts bisection.json
index 337ee39..fc9d823 100644
--- a/recipe_modules/bisect_build/tests/tests.expected/starts bisection.json
+++ b/recipe_modules/bisect_build/tests/tests.expected/starts bisection.json
@@ -48,24 +48,24 @@
"@@@STEP_LOG_LINE@json.output@ \"log\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"bda185dc04d062d391039867ae671ac9133e9801\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"c0d0fdf8bcf7518bc25f8c76a85bf9a50d678529\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 0\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"faed5d85b02d45b884a6c84a69c198c120b36380\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"1f265dfbd3cf9ce15af541154c2e9db6b3ed5d58\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"a32438c6a72030d92b00f5eb682e7745338e6668\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"81bec21a953afebeee3f200ed6a68ea01758323b\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"1f944b71d6fcc086596ced8938eff992cbe4e326\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"d24cd35889c03794446a1766b10167c0e4de38e4\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"a.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -76,24 +76,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"8331c527346abecfe0ad081df241512bb4b7df50\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"a3f2abe0b084940abbd01f222ae55c0597c3a169\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"c50e65308b4d20210b14a612d2afb6acb3e830d9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"f8186661e3db6798c680c1a017908c35df82b57f\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"97cbb78571a53287bb1f64a5679f84c396df55ac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"c88db24d9c3932de7eccbcfd953927685e0ecdab\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"5e881d213594ff0042014750f2ad397eaaeebee4\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"c87d90745b6b84ae513ab3b5a9d6f49d4f72bf19\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"b.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -104,24 +104,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 2\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 2\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"73c504dc712dae16fdd38ba50db2a1c5a669cd22\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"95f8e67b7785ca4bd08e82a4807f8970869861db\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"5ae2afc02495c1adee6a3233581f73dac4f7a76a\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"2b78c14fc5b32c2d431d9bd833c14fbb9ec36cf5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"38952d2a55008e5afca8d49d8dd78c448d1a7c6c\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"4c627dd0f2bf21bf08d55ce6933ebd7ed2a08a5a\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"c.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -143,8 +143,8 @@
"cr-buildbucket.appspot.com"
],
"infra_step": true,
- "name": "schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 2.0, \"bisect_newer\": [\"8331c527346abecfe0ad081df241512bb4b7df50\"], \"bisect_older\": [], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "name": "schedule bisect (67dba66cfa49c62e4a6b501e94997aa4a410fe42)",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"builder\", \"project\": \"project\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 2.0, \"bisect_newer\": [\"a3f2abe0b084940abbd01f222ae55c0597c3a169\"], \"bisect_older\": [], \"bisect_reason\": \"failure\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -174,15 +174,15 @@
"@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bisect_base_build\": 2.0, @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_newer\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"8331c527346abecfe0ad081df241512bb4b7df50\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"a3f2abe0b084940abbd01f222ae55c0597c3a169\"@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_older\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_reason\": \"failure\", @@@",
diff --git a/recipe_modules/bisect_build/tests/tests.py b/recipe_modules/bisect_build/tests/tests.py
index 812730f..a5cbf82 100644
--- a/recipe_modules/bisect_build/tests/tests.py
+++ b/recipe_modules/bisect_build/tests/tests.py
@@ -8,6 +8,7 @@
DoesNotRunRE,
Filter,
MustRun,
+ MustRunRE,
StatusSuccess,
)
@@ -47,7 +48,6 @@
api.buildbucket.ci_build(
builder='builder',
build_number=build_number,
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
revision='f' * 8))
if failure:
@@ -71,15 +71,14 @@
BUILDER = 'foo'
GIT_HASH = '2d72510e447ab60a9728aeea2362d8be2cbd7789'
- STARTS_BISECTION = api.post_process(
- MustRun, 'schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)')
+ STARTS_BISECTION = api.post_process(MustRunRE, 'schedule bisect .*')
DOES_NOT_BISECT = api.post_process(DoesNotRunRE, r'schedule bisect.*')
- builds = [api.bisect_build.build(api, BUILDER, 2, GIT_HASH)]
+ builds = [api.bisect_build.build(BUILDER, 2, GIT_HASH)]
yield (_test(api, 'starts bisection', failure='failure') + api.step_data(
'gitiles log: 2d72510e447ab60a9728aeea2362d8be2cbd7789..ffffffff',
- api.gitiles.make_log_test_data('master')) +
- api.bisect_build.fetch_previous_builds(api, builds) + STARTS_BISECTION)
+ api.gitiles.make_log_test_data('main')) +
+ api.bisect_build.fetch_previous_builds(builds) + STARTS_BISECTION)
yield (_test(
api,
@@ -87,28 +86,27 @@
failure='failure',
is_experimental=True) + api.step_data(
'gitiles log: 2d72510e447ab60a9728aeea2362d8be2cbd7789..ffffffff',
- api.gitiles.make_log_test_data('master')) +
- api.bisect_build.fetch_previous_builds(api, builds) + api.post_process(
- MustRun,
- 'schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)') +
+ api.gitiles.make_log_test_data('main')) +
+ api.bisect_build.fetch_previous_builds(builds) +
+ api.post_process(MustRunRE, 'schedule bisect .*') +
api.post_process(StatusSuccess) + api.post_process(
_sets_experimental_flag,
- 'schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)'))
+ 'schedule bisect (67dba66cfa49c62e4a6b501e94997aa4a410fe42)'))
- builds = [api.bisect_build.build(api, BUILDER, 2, GIT_HASH, is_success=False)]
+ builds = [api.bisect_build.build(BUILDER, 2, GIT_HASH, is_success=False)]
yield (_test(
api, 'do-not-start-bisect-if-previous-build-failed', failure='failure') +
- api.bisect_build.fetch_previous_builds(api, builds) + DOES_NOT_BISECT)
+ api.bisect_build.fetch_previous_builds(builds) + DOES_NOT_BISECT)
builds = [
- api.bisect_build.build(api, BUILDER, 2, GIT_HASH, is_bisection=True),
- api.bisect_build.build(api, BUILDER, 1, GIT_HASH, is_bisection=True),
- api.bisect_build.build(api, BUILDER, 0, GIT_HASH, is_bisection=True),
+ api.bisect_build.build(BUILDER, 2, GIT_HASH, is_bisection=True),
+ api.bisect_build.build(BUILDER, 1, GIT_HASH, is_bisection=True),
+ api.bisect_build.build(BUILDER, 0, GIT_HASH, is_bisection=True),
]
yield (_test(
api,
'do-not-start-bisect-if-all-previous-builds-are-non-regular',
- failure='failure') + api.bisect_build.fetch_previous_builds(api, builds) +
+ failure='failure') + api.bisect_build.fetch_previous_builds(builds) +
DOES_NOT_BISECT)
yield (_test(
diff --git a/recipe_modules/dart/api.py b/recipe_modules/dart/api.py
index c221618..372e612 100644
--- a/recipe_modules/dart/api.py
+++ b/recipe_modules/dart/api.py
@@ -286,13 +286,13 @@
channel = self.m.buildbucket.builder_name.split('-')[-1]
if channel in ['beta', 'dev', 'experimental', 'stable', 'try']:
return channel
- return 'master'
+ return 'main'
def _release_builder(self):
"""Boolean that reports whether the builder is on the
beta, dev, experimental or stable channels. Some steps are only
- run on the master and try builders."""
+ run on the be and try builders."""
return self._channel() in ['beta', 'dev', 'experimental', 'stable']
@@ -306,7 +306,8 @@
"""Returns True if this builder is setup to build a branch (other
than the branches associated with release channels; see
_release_builder)."""
- return (self.m.buildbucket.gitiles_commit.ref != "refs/heads/master" and
+ return (self.m.buildbucket.gitiles_commit.ref not in ("refs/heads/master",
+ "refs/heads/main") and
not self._release_builder() and not self._try_builder())
def _supports_result_database(self):
@@ -320,7 +321,9 @@
if self._release_builder():
return False
return (self._try_builder() or self.m.buildbucket.gitiles_commit.ref in [
- "refs/heads/master", "refs/heads/ci-test-data"
+ "refs/heads/main",
+ "refs/heads/master",
+ "refs/heads/ci-test-data",
])
def _is_bisecting(self):
@@ -404,7 +407,7 @@
if builder.endswith('-try'):
builder = builder[:-4]
target = self.m.tryserver.gerrit_change_target_ref.split('/')[-1]
- if target != 'master':
+ if target not in ('main', 'master'):
builder = '%s-%s' % (builder, target)
return str(builder)
@@ -1069,8 +1072,7 @@
if environment['copy-coredumps']:
args.append('--copy-coredumps')
system = environment['system']
- # TODO(athom): enable this on stable before 2.12 is merged to stable.
- if system == 'win' and self._channel() != 'stable':
+ if system == 'win':
args.append('--cleanup-dart-processes')
# The --chrome flag is added here if the runtime for the bot is
# chrome. This also catches the case where there is a specific
@@ -1244,7 +1246,7 @@
self.environment_variables = step_json.get('environment', {})
channel = m.dart._channel()
- if channel == 'master':
+ if channel == 'main':
channel = 'be'
self.environment_variables['BUILDBOT_BUILDERNAME'] = (
builder_name + "-%s" % channel)
diff --git a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
index 6708bff..fb673ad 100644
--- a/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
+++ b/recipe_modules/dart/examples/example.expected/analyzer-linux-release.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@3456abce78ef",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
@@ -1496,8 +1496,8 @@
"put",
"-host",
"cr-buildbucket.appspot.com",
- "{\"bucket\": \"luci.dart.ci\", \"experimental\": false, \"parameters_json\": \"{\\\"builder_name\\\": \\\"foo-builder\\\", \\\"changes\\\": [], \\\"properties\\\": {\\\"parent_build_id\\\": \\\"\\\", \\\"parent_buildername\\\": \\\"analyzer-linux-release\\\", \\\"parent_fileset\\\": \\\"trigger_hash/47\\\", \\\"parent_fileset_name\\\": \\\"trigger\\\", \\\"revision\\\": \\\"3456abce78ef\\\"}}\", \"tags\": [\"builder:foo-builder\", \"buildset:commit/gitiles/dart.googlesource.com/sdk/+/3456abce78ef\", \"gitiles_ref:refs/heads/master\", \"parent_buildername:analyzer-linux-release\", \"parent_buildnumber:1357\", \"user_agent:recipe\"]}",
- "{\"bucket\": \"luci.dart.ci\", \"experimental\": false, \"parameters_json\": \"{\\\"builder_name\\\": \\\"bar-builder\\\", \\\"changes\\\": [], \\\"properties\\\": {\\\"parent_build_id\\\": \\\"\\\", \\\"parent_buildername\\\": \\\"analyzer-linux-release\\\", \\\"parent_fileset\\\": \\\"trigger_hash/47\\\", \\\"parent_fileset_name\\\": \\\"trigger\\\", \\\"revision\\\": \\\"3456abce78ef\\\"}}\", \"tags\": [\"builder:bar-builder\", \"buildset:commit/gitiles/dart.googlesource.com/sdk/+/3456abce78ef\", \"gitiles_ref:refs/heads/master\", \"parent_buildername:analyzer-linux-release\", \"parent_buildnumber:1357\", \"user_agent:recipe\"]}"
+ "{\"bucket\": \"luci.dart.ci\", \"experimental\": false, \"parameters_json\": \"{\\\"builder_name\\\": \\\"foo-builder\\\", \\\"changes\\\": [], \\\"properties\\\": {\\\"parent_build_id\\\": \\\"\\\", \\\"parent_buildername\\\": \\\"analyzer-linux-release\\\", \\\"parent_fileset\\\": \\\"trigger_hash/47\\\", \\\"parent_fileset_name\\\": \\\"trigger\\\", \\\"revision\\\": \\\"3456abce78ef\\\"}}\", \"tags\": [\"builder:foo-builder\", \"buildset:commit/gitiles/dart.googlesource.com/sdk/+/3456abce78ef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:analyzer-linux-release\", \"parent_buildnumber:1357\", \"user_agent:recipe\"]}",
+ "{\"bucket\": \"luci.dart.ci\", \"experimental\": false, \"parameters_json\": \"{\\\"builder_name\\\": \\\"bar-builder\\\", \\\"changes\\\": [], \\\"properties\\\": {\\\"parent_build_id\\\": \\\"\\\", \\\"parent_buildername\\\": \\\"analyzer-linux-release\\\", \\\"parent_fileset\\\": \\\"trigger_hash/47\\\", \\\"parent_fileset_name\\\": \\\"trigger\\\", \\\"revision\\\": \\\"3456abce78ef\\\"}}\", \"tags\": [\"builder:bar-builder\", \"buildset:commit/gitiles/dart.googlesource.com/sdk/+/3456abce78ef\", \"gitiles_ref:refs/heads/main\", \"parent_buildername:analyzer-linux-release\", \"parent_buildnumber:1357\", \"user_agent:recipe\"]}"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -2915,14 +2915,14 @@
"----",
"cp",
"3456abce78ef",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision@@@"
]
},
{
@@ -2935,14 +2935,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json@@@"
]
},
{
@@ -2955,14 +2955,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t01\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t02\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t02\",\"time_ms\":496,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json@@@"
]
},
{
@@ -2975,14 +2975,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json@@@"
]
},
{
@@ -2995,14 +2995,14 @@
"----",
"cp",
"1357",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/latest"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/latest"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/latest@@@"
]
},
{
diff --git a/recipe_modules/dart/examples/example.expected/basic-mac.json b/recipe_modules/dart/examples/example.expected/basic-mac.json
index 5f642f3..1862d5a 100644
--- a/recipe_modules/dart/examples/example.expected/basic-mac.json
+++ b/recipe_modules/dart/examples/example.expected/basic-mac.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipe_modules/dart/examples/example.expected/basic-missing-name.json b/recipe_modules/dart/examples/example.expected/basic-missing-name.json
index c16dec1..c8c6dc5 100644
--- a/recipe_modules/dart/examples/example.expected/basic-missing-name.json
+++ b/recipe_modules/dart/examples/example.expected/basic-missing-name.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipe_modules/dart/examples/example.expected/bisection-does-not-refer-to-latest-build-or-publish-results.json b/recipe_modules/dart/examples/example.expected/bisection-does-not-refer-to-latest-build-or-publish-results.json
index 72933bc..400a2a7 100644
--- a/recipe_modules/dart/examples/example.expected/bisection-does-not-refer-to-latest-build-or-publish-results.json
+++ b/recipe_modules/dart/examples/example.expected/bisection-does-not-refer-to-latest-build-or-publish-results.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
@@ -1965,14 +1965,14 @@
"----",
"cp",
"2d72510e447ab60a9728aeea2362d8be2cbd7789",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision@@@"
]
},
{
@@ -1985,14 +1985,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json@@@"
]
},
{
@@ -2005,14 +2005,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t01\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json@@@"
]
},
{
@@ -2025,14 +2025,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json@@@"
]
},
{
@@ -2045,14 +2045,14 @@
"----",
"cp",
"2d72510e447ab60a9728aeea2362d8be2cbd7789",
- "gs://dart-test-results/configuration/master/dartk-linux-release-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-release-x64/1357/revision"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-release-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-release-x64/1357/revision@@@"
]
},
{
@@ -2065,14 +2065,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-release-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-release-x64/1357/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-release-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-release-x64/1357/logs.json@@@"
]
},
{
@@ -2085,14 +2085,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t02\",\"configuration\":\"dartk-linux-release-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t02\",\"time_ms\":496,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-release-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-release-x64/1357/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-release-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-release-x64/1357/results.json@@@"
]
},
{
@@ -2105,14 +2105,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-release-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-release-x64/1357/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (3)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-release-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-release-x64/1357/flaky.json@@@"
]
},
{
diff --git a/recipe_modules/dart/examples/example.expected/branch-builder-does-not-publish-results.json b/recipe_modules/dart/examples/example.expected/branch-builder-does-not-publish-results.json
index 0902564..07902ff 100644
--- a/recipe_modules/dart/examples/example.expected/branch-builder-does-not-publish-results.json
+++ b/recipe_modules/dart/examples/example.expected/branch-builder-does-not-publish-results.json
@@ -1005,14 +1005,14 @@
"----",
"cp",
"2d72510e447ab60a9728aeea2362d8be2cbd7789",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision@@@"
]
},
{
@@ -1025,14 +1025,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json@@@"
]
},
{
@@ -1045,14 +1045,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t01\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t02\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t02\",\"time_ms\":496,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json@@@"
]
},
{
@@ -1065,14 +1065,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json@@@"
]
},
{
@@ -1085,14 +1085,14 @@
"----",
"cp",
"1357",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/latest"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/latest"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/latest@@@"
]
},
{
diff --git a/recipe_modules/dart/examples/example.expected/ci-test-data-branch-builder-does-publish-results.json b/recipe_modules/dart/examples/example.expected/ci-test-data-branch-builder-does-publish-results.json
index 67e9040..7518ee6 100644
--- a/recipe_modules/dart/examples/example.expected/ci-test-data-branch-builder-does-publish-results.json
+++ b/recipe_modules/dart/examples/example.expected/ci-test-data-branch-builder-does-publish-results.json
@@ -1042,14 +1042,14 @@
"----",
"cp",
"2d72510e447ab60a9728aeea2362d8be2cbd7789",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision@@@"
]
},
{
@@ -1062,14 +1062,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json@@@"
]
},
{
@@ -1082,14 +1082,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t01\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t02\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t02\",\"time_ms\":496,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json@@@"
]
},
{
@@ -1102,14 +1102,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json@@@"
]
},
{
@@ -1122,14 +1122,14 @@
"----",
"cp",
"1357",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/latest"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/latest"
],
"cwd": "[CACHE]/builder/sdk",
"infra_step": true,
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/latest@@@"
]
},
{
diff --git a/recipe_modules/dart/examples/example.expected/example-android.json b/recipe_modules/dart/examples/example.expected/example-android.json
index aa0edde..b19b389 100644
--- a/recipe_modules/dart/examples/example.expected/example-android.json
+++ b/recipe_modules/dart/examples/example.expected/example-android.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipe_modules/dart/examples/example.expected/example-mac.json b/recipe_modules/dart/examples/example.expected/example-mac.json
index ba7911d..e62a856 100644
--- a/recipe_modules/dart/examples/example.expected/example-mac.json
+++ b/recipe_modules/dart/examples/example.expected/example-mac.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipe_modules/dart/examples/example.expected/fuzz-test.json b/recipe_modules/dart/examples/example.expected/fuzz-test.json
index 17a59d9..e706495 100644
--- a/recipe_modules/dart/examples/example.expected/fuzz-test.json
+++ b/recipe_modules/dart/examples/example.expected/fuzz-test.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipe_modules/dart/examples/example.expected/vm-win.json b/recipe_modules/dart/examples/example.expected/vm-win.json
index 22bc2d5..b4ea88f 100644
--- a/recipe_modules/dart/examples/example.expected/vm-win.json
+++ b/recipe_modules/dart/examples/example.expected/vm-win.json
@@ -2526,14 +2526,14 @@
"----",
"cp",
"3456abce78ef",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision"
],
"cwd": "[CACHE]\\builder\\sdk",
"infra_step": true,
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/revision@@@"
]
},
{
@@ -2546,14 +2546,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json"
],
"cwd": "[CACHE]\\builder\\sdk",
"infra_step": true,
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/logs.json@@@"
]
},
{
@@ -2566,14 +2566,14 @@
"----",
"cp",
"{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t01\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n{\"name\":\"co19_2/Language/Classes/Abstract_Instance_Members/inherited_t02\",\"configuration\":\"dartk-linux-product-x64\",\"suite\":\"co19_2\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t02\",\"time_ms\":496,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json"
],
"cwd": "[CACHE]\\builder\\sdk",
"infra_step": true,
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/results.json@@@"
]
},
{
@@ -2586,14 +2586,14 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json"
],
"cwd": "[CACHE]\\builder\\sdk",
"infra_step": true,
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/1357/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/1357/flaky.json@@@"
]
},
{
@@ -2606,14 +2606,14 @@
"----",
"cp",
"1357",
- "gs://dart-test-results/configuration/master/dartk-linux-product-x64/latest"
+ "gs://dart-test-results/configuration/main/dartk-linux-product-x64/latest"
],
"cwd": "[CACHE]\\builder\\sdk",
"infra_step": true,
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/dartk-linux-product-x64/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/dartk-linux-product-x64/latest@@@"
]
},
{
diff --git a/recipe_modules/dart/examples/example.py b/recipe_modules/dart/examples/example.py
index cc2f0ee..3b4c223 100644
--- a/recipe_modules/dart/examples/example.py
+++ b/recipe_modules/dart/examples/example.py
@@ -442,7 +442,6 @@
api.buildbucket.ci_build(
build_number=1357,
builder='dart2js-strong-linux-x64-firefox',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'test1', 2, False),
@@ -521,7 +520,6 @@
revision='3456abce78ef',
build_number=1357,
builder='analyzer-linux-release',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'test1', 2, False),
@@ -578,7 +576,6 @@
revision='3456abce78ef',
build_number=1357,
builder='analyzer-linux-release',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data('build', retcode=1),
@@ -592,7 +589,6 @@
'basic-missing-name',
api.buildbucket.ci_build(
builder='this-name-does-not-exist-in-test-matrix',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.post_process(StatusException),
@@ -604,7 +600,6 @@
revision='3456abce78ef',
build_number=1357,
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'co19', 1, False),
@@ -623,7 +618,6 @@
revision='3456abce78ef',
build_number=1357,
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'co19', 1, False),
@@ -664,7 +658,6 @@
revision='a' * 40,
build_number=1357,
builder='dart2js-strong-mac-x64-chrome-dev',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.properties(clobber=True, custom_vars={'download_chrome': True}),
@@ -680,7 +673,6 @@
api.platform('mac', 64),
api.buildbucket.ci_build(
builder='vm-kernel-mac-release-x64',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.post_process(StatusSuccess),
@@ -691,7 +683,6 @@
api.platform('linux', 64),
api.buildbucket.ci_build(
builder='vm-kernel-precomp-android-release-arm64',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'android', 2, False),
@@ -703,7 +694,6 @@
'non-test-step-error-is-step-failure',
api.buildbucket.ci_build(
builder='vm-kernel-win-release-simarm_x64',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
_upload_isolate_step_data(api, 'test'),
_upload_isolate_step_data(api, 'trigger'),
@@ -720,7 +710,6 @@
'upload-error-is-infra-failure',
api.buildbucket.ci_build(
builder='co19',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
api.step_data('add fields to result records',
api.raw_io.output_text(RESULT_DATA)),
@@ -735,7 +724,6 @@
'download-results-error-is-infra-failure',
api.buildbucket.ci_build(
builder='co19',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
api.step_data('download previous results.gsutil find latest build',
api.raw_io.output_text("1234", name="latest")),
@@ -750,7 +738,6 @@
'failed-to-get-tests-to-deflake-is-infra-failure',
api.buildbucket.ci_build(
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
_upload_isolate_step_data(api),
api.step_data(deflake_step, retcode=1),
@@ -764,7 +751,6 @@
'failed-to-update-flaky-data-is-infra-failure',
api.buildbucket.ci_build(
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
_upload_isolate_step_data(api),
api.step_data(update_flaky_step, retcode=1),
@@ -778,7 +764,6 @@
'failed-to-update-latest-is-infra-failure',
api.buildbucket.ci_build(
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
_upload_isolate_step_data(api),
api.step_data('add fields to result records',
@@ -794,7 +779,6 @@
'failed-to-upload-is-infra-failure',
api.buildbucket.ci_build(
builder='co19',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk'),
api.step_data(upload_step, retcode=1),
api.post_process(StepException, upload_step),
@@ -809,7 +793,6 @@
revision='3456abce78ef',
build_number=1357,
builder='co19',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data('add fields to result records',
@@ -825,7 +808,6 @@
_upload_isolate_step_data(api),
api.buildbucket.ci_build(
builder='fuzz-linux',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data(
@@ -844,7 +826,6 @@
_upload_isolate_step_data(api),
api.buildbucket.ci_build(
builder='fuzz-linux',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data(
@@ -866,7 +847,6 @@
api.properties(bot_id='trusty-dart-123'),
api.buildbucket.ci_build(
builder='analyzer-linux-release',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data(
@@ -888,7 +868,6 @@
api.properties(bot_id='trusty-dart-123'),
api.buildbucket.ci_build(
builder='analyzer-linux-release',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data('test3_shard_2', retcode=1),
@@ -907,7 +886,6 @@
revision='3456abce78ef',
build_number=1357,
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
_canned_step(api, 'co19', 1, False),
@@ -925,7 +903,6 @@
revision='3456abce78ef',
build_number=1357,
builder='co19',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data('gclient get package versions',
@@ -940,7 +917,6 @@
api.buildbucket.try_build(
build_number=1357,
builder='dart2js-strong-linux-x64-firefox-try',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data('custom_runner', retcode=1),
@@ -954,7 +930,6 @@
'invalid-fileset-upload-output',
api.buildbucket.ci_build(
builder='co19_sharded',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
api.step_data(
diff --git a/recipes/cron/cron.expected/schedule-builds.json b/recipes/cron/cron.expected/schedule-builds.json
index 6ed8a22..994ff27 100644
--- a/recipes/cron/cron.expected/schedule-builds.json
+++ b/recipes/cron/cron.expected/schedule-builds.json
@@ -7,7 +7,7 @@
"--json-file",
"/path/to/tmp/json",
"--url",
- "https://dart.googlesource.com/sdk/+log/refs/heads/master",
+ "https://dart.googlesource.com/sdk/+log/refs/heads/main",
"--format",
"json",
"--log-limit",
@@ -81,7 +81,7 @@
],
"infra_step": true,
"name": "schedule builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"cross\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"msan\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"cross\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"msan\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -123,7 +123,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
@@ -147,7 +147,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", @@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
diff --git a/recipes/cron/cron.expected/skip-duplicate-build.json b/recipes/cron/cron.expected/skip-duplicate-build.json
index 17c9b1f..29bc21d 100644
--- a/recipes/cron/cron.expected/skip-duplicate-build.json
+++ b/recipes/cron/cron.expected/skip-duplicate-build.json
@@ -8,7 +8,7 @@
],
"infra_step": true,
"name": "schedule builds",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"cross\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"cross\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -40,7 +40,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"ef70cb069518e6dc3ff24bfae7f195de5099c377\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", @@@",
"@@@STEP_LOG_LINE@request@ \"tags\": [@@@",
diff --git a/recipes/cron/cron.py b/recipes/cron/cron.py
index 15eae5a..36c9f71 100644
--- a/recipes/cron/cron.py
+++ b/recipes/cron/cron.py
@@ -16,7 +16,7 @@
BUCKET = 'ci.sandbox'
HOST = 'dart.googlesource.com'
REPO = 'sdk'
-REF = 'refs/heads/master'
+REF = 'refs/heads/main'
DEPS = [
'depot_tools/gitiles',
diff --git a/recipes/dart/cbuild.expected/experimental-with-results.json b/recipes/dart/cbuild.expected/experimental-with-results.json
index 9135442..38c47fd 100644
--- a/recipes/dart/cbuild.expected/experimental-with-results.json
+++ b/recipes/dart/cbuild.expected/experimental-with-results.json
@@ -29,7 +29,7 @@
"name": "gsutil download cbuild result for hash-of-success",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": true@@@",
@@ -53,7 +53,7 @@
"name": "gsutil download cbuild result for hash-of-regression",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": true, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -77,7 +77,7 @@
"name": "gsutil download cbuild result for hash-of-presubmit",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": true, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -101,7 +101,7 @@
"name": "gsutil download cbuild result for hash-of-failure",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -142,7 +142,7 @@
],
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-success\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"SUCCESS\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-regression\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-failure\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-success\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"SUCCESS\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-regression\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-failure\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -190,7 +190,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-success\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"SUCCESS\", @@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-regression\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
@@ -244,7 +244,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-failure\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
diff --git a/recipes/dart/cbuild.expected/with-results.json b/recipes/dart/cbuild.expected/with-results.json
index dd69225..1558fc4 100644
--- a/recipes/dart/cbuild.expected/with-results.json
+++ b/recipes/dart/cbuild.expected/with-results.json
@@ -29,7 +29,7 @@
"name": "gsutil download cbuild result for hash-of-success",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": true@@@",
@@ -53,7 +53,7 @@
"name": "gsutil download cbuild result for hash-of-regression",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": true, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -77,7 +77,7 @@
"name": "gsutil download cbuild result for hash-of-presubmit",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": true, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -101,7 +101,7 @@
"name": "gsutil download cbuild result for hash-of-failure",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output[result]@{@@@",
- "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"master\", @@@",
+ "@@@STEP_LOG_LINE@json.output[result]@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"presubmit\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"regression\": false, @@@",
"@@@STEP_LOG_LINE@json.output[result]@ \"result\": false@@@",
@@ -142,7 +142,7 @@
],
"infra_step": true,
"name": "buildbucket.schedule",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-success\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"SUCCESS\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-regression\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-failure\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-success\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"SUCCESS\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-success\"}, \"requestId\": \"0-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-regression\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-regression\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133a\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}, {\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci.sandbox\", \"builder\": \"google\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"hash-of-failure\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"properties\": {\"result\": \"FAILURE\", \"url\": \"https://goto.google.com/dart-cbuild/find/hash-of-failure\"}, \"requestId\": \"0-00000000-0000-0000-0000-00000000133d\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -190,7 +190,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-success\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"SUCCESS\", @@@",
@@ -217,7 +217,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-regression\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
@@ -244,7 +244,7 @@
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
"@@@STEP_LOG_LINE@request@ \"id\": \"hash-of-failure\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"result\": \"FAILURE\", @@@",
diff --git a/recipes/dart/cbuild.py b/recipes/dart/cbuild.py
index 4497527..b55c79c 100644
--- a/recipes/dart/cbuild.py
+++ b/recipes/dart/cbuild.py
@@ -39,7 +39,7 @@
'''
HOST = 'dart.googlesource.com'
GERRIT_HOST_URL = 'dart-review.googlesource.com'
-REF = 'refs/heads/master'
+REF = 'refs/heads/main'
REPO = 'sdk'
REPO_URL = 'https://%s/%s' % (HOST, REPO)
@@ -53,7 +53,8 @@
for result in results:
is_presubmit = result['presubmit']
branch = result['branch']
- if not is_presubmit and branch == 'master':
+ # TODO(athom): Remove master when cbuild only sends main branch messages.
+ if not is_presubmit and branch in ('master', 'main'):
requests.append(_create_schedule_build_request(api, result))
api.buildbucket.schedule(requests)
with api.step.defer_results():
@@ -170,7 +171,7 @@
result=True,
regression=False,
presubmit=False,
- branch='master'):
+ branch='main'):
cbuild_result = {
'result': result,
'regression': regression,
diff --git a/recipes/dart/flutter_engine.py b/recipes/dart/flutter_engine.py
index d3ffcc5..d11691a 100644
--- a/recipes/dart/flutter_engine.py
+++ b/recipes/dart/flutter_engine.py
@@ -9,6 +9,7 @@
DoesNotRunRE,
Filter,
MustRun,
+ MustRunRE,
StatusSuccess,
StatusException,
)
@@ -348,7 +349,7 @@
],
timeout=20 * 60) # 20 minutes
- # Runs all flutter tests similar to Cirrus as described on this page:
+ # Runs all flutter tests as described on this page:
# https://github.com/flutter/flutter/blob/master/CONTRIBUTING.md
for test_suite in test_suites:
with api.context(
@@ -507,14 +508,13 @@
+ api.post_process(DoesNotRunRE, r'schedule bisect.*'))
yield (_test(api, 'start-bisect', failure=True) +
- api.bisect_build.fetch_previous_builds(api, [
- api.bisect_build.build(api, "foo", 4710,
+ api.bisect_build.fetch_previous_builds([
+ api.bisect_build.build("foo", 4710,
"2d72510e447ab60a9728aeea2362d8be2cbd7789")
]) + api.step_data(
'gitiles log: 2d72510e447ab60a9728aeea2362d8be2cbd7789..ffffffff',
- api.gitiles.make_log_test_data('master')) + api.post_process(
- MustRun,
- 'schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)'))
+ api.gitiles.make_log_test_data('master')) +
+ api.post_process(MustRunRE, 'schedule bisect .*'))
yield (_test(api, 'continue-bisect-on-success') + api.properties(
bisect_newer=['a', 'b', 'c'],
diff --git a/recipes/dart/forward_branch.expected/base.json b/recipes/dart/forward_branch.expected/base.json
index afa0e49..40ec0e7 100644
--- a/recipes/dart/forward_branch.expected/base.json
+++ b/recipes/dart/forward_branch.expected/base.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@2d72510e447ab60a9728aeea2362d8be2cbd7789",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/dart/forward_branch.py b/recipes/dart/forward_branch.py
index dbbc791..55c8167 100644
--- a/recipes/dart/forward_branch.py
+++ b/recipes/dart/forward_branch.py
@@ -46,7 +46,6 @@
bucket='ci',
builder='base',
git_repo='https://dart.googlesource.com/a/sdk.git',
- git_ref='refs/heads/master',
),
)
@@ -58,7 +57,6 @@
bucket='ci',
builder='base',
git_repo='https://dart.googlesource.com/a/sdk.git',
- git_ref='refs/heads/master',
),
api.expect_exception('AssertionError'),
api.post_process(post_process.DropExpectation),
diff --git a/recipes/dart/gclient.expected/try.json b/recipes/dart/gclient.expected/try.json
index d809dd1..0f55cfd 100644
--- a/recipes/dart/gclient.expected/try.json
+++ b/recipes/dart/gclient.expected/try.json
@@ -27,7 +27,7 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branch\": \"refs/heads/master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"owner\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"John Doe\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -75,7 +75,7 @@
"--with_branch_heads",
"--with_tags",
"--patch-ref",
- "https://chromium.googlesource.com/chromium/src@refs/heads/master:refs/changes/89/456789/12",
+ "https://chromium.googlesource.com/chromium/src@refs/heads/main:refs/changes/89/456789/12",
"--delete_unversioned_trees",
"--output-json",
"/path/to/tmp/json"
diff --git a/recipes/dart/gclient.py b/recipes/dart/gclient.py
index 80510c8..203164e 100644
--- a/recipes/dart/gclient.py
+++ b/recipes/dart/gclient.py
@@ -35,10 +35,8 @@
def GenTests(api):
yield api.test(
'ci',
- api.tryserver.gerrit_change_target_ref('refs/heads/master'),
)
yield api.test(
'try',
- api.tryserver.gerrit_change_target_ref('refs/heads/master'),
api.properties.tryserver(),
)
diff --git a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
index 91401d3..6974981 100644
--- a/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
+++ b/recipes/dart/neo.expected/builders_dart2js-win-debug-x64-firefox-try.json
@@ -29,7 +29,7 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branch\": \"refs/heads/master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"owner\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"John Doe\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -62,11 +62,11 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://dart.googlesource.com/sdk@refs/heads/master:refs/changes/56/123456/7",
+ "https://dart.googlesource.com/sdk@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "sdk@refs/heads/master",
+ "sdk@refs/heads/main",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
index 47d4a0f..10a04df 100644
--- a/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
+++ b/recipes/dart/neo.expected/failing-test-step-starts-bisection.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@1a2b3c4d",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
@@ -1347,7 +1347,7 @@
"----",
"cp",
"1a2b3c4d",
- "gs://dart-test-results/configuration/master/config_bar/4711/revision"
+ "gs://dart-test-results/configuration/main/config_bar/4711/revision"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1357,7 +1357,7 @@
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/4711/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/4711/revision@@@"
]
},
{
@@ -1370,7 +1370,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/4711/logs.json"
+ "gs://dart-test-results/configuration/main/config_bar/4711/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1380,7 +1380,7 @@
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/4711/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/4711/logs.json@@@"
]
},
{
@@ -1393,7 +1393,7 @@
"----",
"cp",
"{\"name\":\"test_foo\",\"configuration\":\"config_bar\",\"suite\":\"suite_baz\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/config_bar/4711/results.json"
+ "gs://dart-test-results/configuration/main/config_bar/4711/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1403,7 +1403,7 @@
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/4711/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/4711/results.json@@@"
]
},
{
@@ -1416,7 +1416,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/4711/flaky.json"
+ "gs://dart-test-results/configuration/main/config_bar/4711/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1426,7 +1426,7 @@
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/4711/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/4711/flaky.json@@@"
]
},
{
@@ -1439,7 +1439,7 @@
"----",
"cp",
"4711",
- "gs://dart-test-results/configuration/master/config_bar/latest"
+ "gs://dart-test-results/configuration/main/config_bar/latest"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1449,7 +1449,7 @@
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/latest@@@"
]
},
{
@@ -1708,24 +1708,24 @@
"@@@STEP_LOG_LINE@json.output@ \"log\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"bda185dc04d062d391039867ae671ac9133e9801\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"c0d0fdf8bcf7518bc25f8c76a85bf9a50d678529\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_0.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_0.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 0\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 0\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"faed5d85b02d45b884a6c84a69c198c120b36380\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"1f265dfbd3cf9ce15af541154c2e9db6b3ed5d58\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"a32438c6a72030d92b00f5eb682e7745338e6668\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"81bec21a953afebeee3f200ed6a68ea01758323b\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"1f944b71d6fcc086596ced8938eff992cbe4e326\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"d24cd35889c03794446a1766b10167c0e4de38e4\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"a.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -1736,24 +1736,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"8331c527346abecfe0ad081df241512bb4b7df50\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"a3f2abe0b084940abbd01f222ae55c0597c3a169\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_1.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_1.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 1\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"c50e65308b4d20210b14a612d2afb6acb3e830d9\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"f8186661e3db6798c680c1a017908c35df82b57f\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"97cbb78571a53287bb1f64a5679f84c396df55ac\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"c88db24d9c3932de7eccbcfd953927685e0ecdab\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"5e881d213594ff0042014750f2ad397eaaeebee4\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"c87d90745b6b84ae513ab3b5a9d6f49d4f72bf19\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"b.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -1764,24 +1764,24 @@
"@@@STEP_LOG_LINE@json.output@ }, @@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
"@@@STEP_LOG_LINE@json.output@ \"author\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"commit\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"commit\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"committer\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_master@fake_2.email.com\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"email\": \"fake_main@fake_2.email.com\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"name\": \"fake_main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"time\": \"Mon Jan 01 00:00:00 2015\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake master msg 2\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"message\": \"fake main msg 2\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"parents\": [@@@",
- "@@@STEP_LOG_LINE@json.output@ \"73c504dc712dae16fdd38ba50db2a1c5a669cd22\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"95f8e67b7785ca4bd08e82a4807f8970869861db\"@@@",
"@@@STEP_LOG_LINE@json.output@ ], @@@",
- "@@@STEP_LOG_LINE@json.output@ \"tree\": \"5ae2afc02495c1adee6a3233581f73dac4f7a76a\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"tree\": \"2b78c14fc5b32c2d431d9bd833c14fbb9ec36cf5\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"tree_diff\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"38952d2a55008e5afca8d49d8dd78c448d1a7c6c\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"new_id\": \"4c627dd0f2bf21bf08d55ce6933ebd7ed2a08a5a\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_mode\": 33188, @@@",
"@@@STEP_LOG_LINE@json.output@ \"new_path\": \"c.py\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"old_id\": \"0000000000000000000000000000000000000000\", @@@",
@@ -1803,8 +1803,8 @@
"cr-buildbucket.appspot.com"
],
"infra_step": true,
- "name": "schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)",
- "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"dart2js-win-debug-x64-firefox\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", \"project\": \"sdk\", \"ref\": \"refs/heads/master\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4710.0, \"bisect_newer\": [\"8331c527346abecfe0ad081df241512bb4b7df50\"], \"bisect_older\": [], \"bisect_reason\": \"1 out of 1 aggregated steps failed: Step('test results') (retcode: 1)\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
+ "name": "schedule bisect (67dba66cfa49c62e4a6b501e94997aa4a410fe42)",
+ "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"ci\", \"builder\": \"dart2js-win-debug-x64-firefox\", \"project\": \"dart\"}, \"experimental\": \"NO\", \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", \"gitilesCommit\": {\"host\": \"dart.googlesource.com\", \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", \"project\": \"sdk\", \"ref\": \"refs/heads/main\"}, \"priority\": 30, \"properties\": {\"bisect_base_build\": 4710.0, \"bisect_newer\": [\"a3f2abe0b084940abbd01f222ae55c0597c3a169\"], \"bisect_older\": [], \"bisect_reason\": \"1 out of 1 aggregated steps failed: Step('test results') (retcode: 1)\", \"bisection_enabled\": true}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-000000001337\", \"tags\": [{\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@",
@@ -1834,15 +1834,15 @@
"@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,input,number,output,startTime,status,updateTime\", @@@",
"@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@",
"@@@STEP_LOG_LINE@request@ \"host\": \"dart.googlesource.com\", @@@",
- "@@@STEP_LOG_LINE@request@ \"id\": \"f4d35da881f8fd329a4d3e01dd78b66a502d5c49\", @@@",
+ "@@@STEP_LOG_LINE@request@ \"id\": \"67dba66cfa49c62e4a6b501e94997aa4a410fe42\", @@@",
"@@@STEP_LOG_LINE@request@ \"project\": \"sdk\", @@@",
- "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/master\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@",
"@@@STEP_LOG_LINE@request@ }, @@@",
"@@@STEP_LOG_LINE@request@ \"priority\": 30, @@@",
"@@@STEP_LOG_LINE@request@ \"properties\": {@@@",
"@@@STEP_LOG_LINE@request@ \"bisect_base_build\": 4710.0, @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_newer\": [@@@",
- "@@@STEP_LOG_LINE@request@ \"8331c527346abecfe0ad081df241512bb4b7df50\"@@@",
+ "@@@STEP_LOG_LINE@request@ \"a3f2abe0b084940abbd01f222ae55c0597c3a169\"@@@",
"@@@STEP_LOG_LINE@request@ ], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_older\": [], @@@",
"@@@STEP_LOG_LINE@request@ \"bisect_reason\": \"1 out of 1 aggregated steps failed: Step('test results') (retcode: 1)\", @@@",
diff --git a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
index 46327b2..87771ab 100644
--- a/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/infra-failure-does-not-start-bisection.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@1a2b3c4d",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
@@ -1347,7 +1347,7 @@
"----",
"cp",
"1a2b3c4d",
- "gs://dart-test-results/configuration/master/config_bar/0/revision"
+ "gs://dart-test-results/configuration/main/config_bar/0/revision"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1357,7 +1357,7 @@
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/revision@@@"
]
},
{
@@ -1370,7 +1370,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/0/logs.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1380,7 +1380,7 @@
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/logs.json@@@"
]
},
{
@@ -1393,7 +1393,7 @@
"----",
"cp",
"{\"name\":\"test_foo\",\"configuration\":\"config_bar\",\"suite\":\"suite_baz\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/config_bar/0/results.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1403,7 +1403,7 @@
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/results.json@@@"
]
},
{
@@ -1416,7 +1416,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/0/flaky.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1426,7 +1426,7 @@
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/flaky.json@@@"
]
},
{
@@ -1439,7 +1439,7 @@
"----",
"cp",
"0",
- "gs://dart-test-results/configuration/master/config_bar/latest"
+ "gs://dart-test-results/configuration/main/config_bar/latest"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1449,7 +1449,7 @@
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/latest@@@"
]
},
{
diff --git a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
index e5d7352..637d880 100644
--- a/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/successful-build-does-not-start-bisection.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@1a2b3c4d",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
@@ -1347,7 +1347,7 @@
"----",
"cp",
"1a2b3c4d",
- "gs://dart-test-results/configuration/master/config_bar/0/revision"
+ "gs://dart-test-results/configuration/main/config_bar/0/revision"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1357,7 +1357,7 @@
"name": "upload new results.gsutil upload revision (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/revision@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/revision@@@"
]
},
{
@@ -1370,7 +1370,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/0/logs.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/logs.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1380,7 +1380,7 @@
"name": "upload new results.gsutil upload logs.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/logs.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/logs.json@@@"
]
},
{
@@ -1393,7 +1393,7 @@
"----",
"cp",
"{\"name\":\"test_foo\",\"configuration\":\"config_bar\",\"suite\":\"suite_baz\",\"test_name\":\"Language/Classes/Abstract_Instance_Members/inherited_t01\",\"time_ms\":451,\"result\":\"CompileTimeError\",\"expected\":\"CompileTimeError\",\"matches\":true,\"commit_time\":1551185312,\"commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"build_number\":\"2404\",\"builder_name\":\"vm-kernel-linux-product-x64\",\"bot_name\":\"trusty-dart-68765ebb-us-central1-b-2ls0\",\"flaky\":false,\"previous_flaky\":false,\"previous_result\":\"CompileTimeError\",\"previous_commit_hash\":\"f0042a32250a8a6193e6d07e2b6508b13f43c864\",\"previous_commit_time\":1551185312,\"previous_build_number\":2403,\"changed\":false}\n",
- "gs://dart-test-results/configuration/master/config_bar/0/results.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/results.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1403,7 +1403,7 @@
"name": "upload new results.gsutil upload results.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/results.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/results.json@@@"
]
},
{
@@ -1416,7 +1416,7 @@
"----",
"cp",
"",
- "gs://dart-test-results/configuration/master/config_bar/0/flaky.json"
+ "gs://dart-test-results/configuration/main/config_bar/0/flaky.json"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1426,7 +1426,7 @@
"name": "upload new results.gsutil upload flaky.json (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/0/flaky.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/0/flaky.json@@@"
]
},
{
@@ -1439,7 +1439,7 @@
"----",
"cp",
"0",
- "gs://dart-test-results/configuration/master/config_bar/latest"
+ "gs://dart-test-results/configuration/main/config_bar/latest"
],
"cwd": "[CACHE]/builder/sdk",
"env": {
@@ -1449,7 +1449,7 @@
"name": "upload new results.gsutil update \"latest\" reference (2)",
"~followup_annotations": [
"@@@STEP_NEST_LEVEL@1@@@",
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/master/config_bar/latest@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/dart-test-results/configuration/main/config_bar/latest@@@"
]
},
{
diff --git a/recipes/dart/neo.expected/toplevel-infra-failure-does-not-start-bisection.json b/recipes/dart/neo.expected/toplevel-infra-failure-does-not-start-bisection.json
index 00b7b37..c8f3d0f 100644
--- a/recipes/dart/neo.expected/toplevel-infra-failure-does-not-start-bisection.json
+++ b/recipes/dart/neo.expected/toplevel-infra-failure-does-not-start-bisection.json
@@ -17,7 +17,7 @@
"--revision",
"sdk@1a2b3c4d",
"--refs",
- "refs/heads/master"
+ "refs/heads/main"
],
"cwd": "[CACHE]/builder",
"env": {
diff --git a/recipes/dart/neo.py b/recipes/dart/neo.py
index 1938d7c..4b05426 100644
--- a/recipes/dart/neo.py
+++ b/recipes/dart/neo.py
@@ -8,6 +8,7 @@
DoesNotRunRE,
DropExpectation,
MustRun,
+ MustRunRE,
StatusException,
StatusFailure,
StatusSuccess,
@@ -139,10 +140,8 @@
'builders/dart2js-win-debug-x64-firefox-try',
api.buildbucket.try_build(
builder='dart2js-win-debug-x64-firefox-try',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart'),
- api.tryserver.gerrit_change_target_ref('refs/heads/master'),
api.properties(
Gclient(
custom_vars=json_format.ParseDict({
@@ -156,7 +155,6 @@
'successful-build-does-not-start-bisection',
api.buildbucket.ci_build(
builder='dart2js-win-debug-x64-firefox',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
revision=TESTED_REVISION),
@@ -171,7 +169,6 @@
'infra-failure-does-not-start-bisection',
api.buildbucket.ci_build(
builder='dart2js-win-debug-x64-firefox',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
revision=TESTED_REVISION),
@@ -189,7 +186,6 @@
api.buildbucket.ci_build(
# Specifies a builder that is not in the test matrix:
builder='undefined-builder-name',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
revision=TESTED_REVISION),
@@ -202,7 +198,6 @@
'failing-test-step-starts-bisection',
api.buildbucket.ci_build(
builder='dart2js-win-debug-x64-firefox',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
build_number=4711,
@@ -212,19 +207,17 @@
api.raw_io.output_text(RESULT_DATA)),
# Create a successful base build for the bisection
# (see bisect_build/test_api.py)
- api.bisect_build.fetch_previous_builds(api, [
- api.bisect_build.build(api, 'foo', 4710,
+ api.bisect_build.fetch_previous_builds([
+ api.bisect_build.build('foo', 4710,
'2d72510e447ab60a9728aeea2362d8be2cbd7789')
]) +
# Create a fake gitiles log for the bisection algorithm (see gitiles/test_api.py)
api.step_data(
'gitiles log: 2d72510e447ab60a9728aeea2362d8be2cbd7789..%s' %
- TESTED_REVISION, api.gitiles.make_log_test_data('master')),
+ TESTED_REVISION, api.gitiles.make_log_test_data('main')),
# Make test step fail by failing the 'test results' step
api.step_data('test results', retcode=1),
- api.post_process(
- MustRun,
- 'schedule bisect (f4d35da881f8fd329a4d3e01dd78b66a502d5c49)'),
+ api.post_process(MustRunRE, 'schedule bisect .*'),
api.post_process(StatusFailure),
)
@@ -232,7 +225,6 @@
'different-failure-in-bisection-schedules-two-bisection-builds',
api.buildbucket.ci_build(
builder='dart2js-win-debug-x64-firefox',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
revision=TESTED_REVISION),
diff --git a/recipes/dart/package_co19.py b/recipes/dart/package_co19.py
index ffd9e39..672466f 100644
--- a/recipes/dart/package_co19.py
+++ b/recipes/dart/package_co19.py
@@ -35,7 +35,7 @@
api.buildbucket.ci_build(
builder='co19',
revision='',
- git_repo='https://dart.googlesource.com/sdk',
+ git_repo='https://dart.googlesource.com/co19',
project='dart'),
)
@@ -44,7 +44,7 @@
api.buildbucket.ci_build(
builder='co19',
revision='abcdefgh',
- git_repo='https://dart.googlesource.com/sdk',
+ git_repo='https://dart.googlesource.com/co19',
project='dart'),
)
@@ -53,7 +53,7 @@
api.buildbucket.ci_build(
builder='co19',
revision='abcdefgh',
- git_repo='https://dart.googlesource.com/sdk',
+ git_repo='https://dart.googlesource.com/co19',
project='dart'),
api.properties(variant='legacy'),
)
diff --git a/recipes/presubmit/presubmit.expected/failure.json b/recipes/presubmit/presubmit.expected/failure.json
index b6d2979..2b71433 100644
--- a/recipes/presubmit/presubmit.expected/failure.json
+++ b/recipes/presubmit/presubmit.expected/failure.json
@@ -28,7 +28,7 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branch\": \"refs/heads/master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"owner\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"John Doe\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -61,11 +61,11 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://dart.googlesource.com/sdk@refs/heads/master:refs/changes/56/123456/7",
+ "https://dart.googlesource.com/sdk@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "sdk@refs/heads/master",
+ "sdk@refs/heads/main",
"--refs",
- "refs/heads/master",
+ "refs/heads/main",
"--no_fetch_tags"
],
"cwd": "[CACHE]/builder",
@@ -155,7 +155,7 @@
"--gerrit_project",
"sdk",
"--gerrit_branch",
- "refs/heads/master",
+ "refs/heads/main",
"--gerrit_fetch",
"--root",
"[CACHE]/builder/sdk",
diff --git a/recipes/presubmit/presubmit.expected/success.json b/recipes/presubmit/presubmit.expected/success.json
index ee10a2e..e756420 100644
--- a/recipes/presubmit/presubmit.expected/success.json
+++ b/recipes/presubmit/presubmit.expected/success.json
@@ -28,7 +28,7 @@
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@[@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"branch\": \"refs/heads/master\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"branch\": \"main\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"owner\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"name\": \"John Doe\"@@@",
"@@@STEP_LOG_LINE@json.output@ }, @@@",
@@ -61,11 +61,11 @@
"--output_json",
"/path/to/tmp/json",
"--patch_ref",
- "https://dart.googlesource.com/sdk@refs/heads/master:refs/changes/56/123456/7",
+ "https://dart.googlesource.com/sdk@refs/heads/main:refs/changes/56/123456/7",
"--revision",
- "sdk@refs/heads/master",
+ "sdk@refs/heads/main",
"--refs",
- "refs/heads/master",
+ "refs/heads/main",
"--no_fetch_tags"
],
"cwd": "[CACHE]/builder",
@@ -155,7 +155,7 @@
"--gerrit_project",
"sdk",
"--gerrit_branch",
- "refs/heads/master",
+ "refs/heads/main",
"--gerrit_fetch",
"--root",
"[CACHE]/builder/sdk",
@@ -207,7 +207,7 @@
"--gerrit_project",
"sdk",
"--gerrit_branch",
- "refs/heads/master",
+ "refs/heads/main",
"--gerrit_fetch",
"--root",
"[CACHE]/builder/sdk",
diff --git a/recipes/presubmit/presubmit.py b/recipes/presubmit/presubmit.py
index a5a4b33..7fb3102 100644
--- a/recipes/presubmit/presubmit.py
+++ b/recipes/presubmit/presubmit.py
@@ -41,11 +41,9 @@
api.buildbucket.try_build(
build_number=1357,
builder='presubmit-try',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
),
- api.tryserver.gerrit_change_target_ref('refs/heads/master'),
api.step_data(
'presubmit',
api.json.output({
@@ -61,11 +59,9 @@
api.buildbucket.try_build(
build_number=1357,
builder='presubmit-try',
- git_ref='refs/heads/master',
git_repo='https://dart.googlesource.com/sdk',
project='dart',
),
- api.tryserver.gerrit_change_target_ref('refs/heads/master'),
api.step_data(
'presubmit',
api.json.output({
