Run packaging only in beta|stable channels. Ensure packaging builders run only on beta and stable branches. Bug: https://github.com/flutter/flutter/issues/115492 Change-Id: Ied15f6570ad10c11a2c210677bc8f71e83b0e45a Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/37283 Reviewed-by: Jesse Seales <jseales@google.com> Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/release/release_builder.expected/basic_linux_main.json b/recipes/release/release_builder.expected/basic_linux_main.json index 98d4b95..ec69183 100644 --- a/recipes/release/release_builder.expected/basic_linux_main.json +++ b/recipes/release/release_builder.expected/basic_linux_main.json
@@ -405,125 +405,6 @@ ] }, { - "cmd": [ - "bb", - "batch", - "-host", - "cr-buildbucket.appspot.com" - ], - "infra_step": true, - "luci_context": { - "realm": { - "name": "prod:try" - }, - "resultdb": { - "current_invocation": { - "name": "invocations/build:8945511751514863184", - "update_token": "token" - }, - "hostname": "rdbhost" - } - }, - "name": "launch builds.schedule (2)", - "stdin": "{\"requests\": [{\"scheduleBuild\": {\"builder\": {\"bucket\": \"try\", \"builder\": \"Linux Engine Drone\", \"project\": \"prod\"}, \"exe\": {\"cipdVersion\": \"refs/heads/main\"}, \"experimental\": \"NO\", \"experiments\": {\"luci.buildbucket.parent_tracking\": false}, \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", \"gerritChanges\": [{\"change\": \"123456\", \"host\": \"flutter-review.googlesource.com\", \"patchset\": \"7\", \"project\": \"mirrors/engine\"}], \"gitilesCommit\": {\"host\": \"flutter.googlesource.com\", \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", \"project\": \"mirrors/engine\", \"ref\": \"refs/heads/main\"}, \"priority\": 25, \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}, \"build\": {\"enabled_branches\": [\"beta\", \"main\"], \"name\": \"linux packaging one\", \"properties\": {\"$flutter/osx_sdk\": {\"sdk_version\": \"14a5294e\"}}, \"recipe\": \"release/something\", \"scheduler\": \"release\"}, \"environment\": \"Staging\", \"recipe\": \"release/something\", \"repository\": \"engine\"}, \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", \"swarming\": {\"parentRunId\": \"fake-task-id\"}, \"tags\": [{\"key\": \"cq_experimental\", \"value\": \"false\"}, {\"key\": \"parent_buildbucket_id\", \"value\": \"8945511751514863184\"}, {\"key\": \"user_agent\", \"value\": \"recipe\"}]}}]}", - "~followup_annotations": [ - "@@@STEP_NEST_LEVEL@1@@@", - "@@@STEP_LOG_LINE@json.output@{@@@", - "@@@STEP_LOG_LINE@json.output@ \"responses\": [@@@", - "@@@STEP_LOG_LINE@json.output@ {@@@", - "@@@STEP_LOG_LINE@json.output@ \"scheduleBuild\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@json.output@ \"bucket\": \"try\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"builder\": \"Linux Engine Drone\", @@@", - "@@@STEP_LOG_LINE@json.output@ \"project\": \"prod\"@@@", - "@@@STEP_LOG_LINE@json.output@ }, @@@", - "@@@STEP_LOG_LINE@json.output@ \"id\": \"8922054662172514001\"@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ }@@@", - "@@@STEP_LOG_LINE@json.output@ ]@@@", - "@@@STEP_LOG_LINE@json.output@}@@@", - "@@@STEP_LOG_END@json.output@@@", - "@@@STEP_LOG_LINE@request@{@@@", - "@@@STEP_LOG_LINE@request@ \"requests\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"scheduleBuild\": {@@@", - "@@@STEP_LOG_LINE@request@ \"builder\": {@@@", - "@@@STEP_LOG_LINE@request@ \"bucket\": \"try\", @@@", - "@@@STEP_LOG_LINE@request@ \"builder\": \"Linux Engine Drone\", @@@", - "@@@STEP_LOG_LINE@request@ \"project\": \"prod\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"exe\": {@@@", - "@@@STEP_LOG_LINE@request@ \"cipdVersion\": \"refs/heads/main\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"experimental\": \"NO\", @@@", - "@@@STEP_LOG_LINE@request@ \"experiments\": {@@@", - "@@@STEP_LOG_LINE@request@ \"luci.buildbucket.parent_tracking\": false@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,input,number,output,startTime,status,updateTime\", @@@", - "@@@STEP_LOG_LINE@request@ \"gerritChanges\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"change\": \"123456\", @@@", - "@@@STEP_LOG_LINE@request@ \"host\": \"flutter-review.googlesource.com\", @@@", - "@@@STEP_LOG_LINE@request@ \"patchset\": \"7\", @@@", - "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ], @@@", - "@@@STEP_LOG_LINE@request@ \"gitilesCommit\": {@@@", - "@@@STEP_LOG_LINE@request@ \"host\": \"flutter.googlesource.com\", @@@", - "@@@STEP_LOG_LINE@request@ \"id\": \"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa\", @@@", - "@@@STEP_LOG_LINE@request@ \"project\": \"mirrors/engine\", @@@", - "@@@STEP_LOG_LINE@request@ \"ref\": \"refs/heads/main\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"priority\": 25, @@@", - "@@@STEP_LOG_LINE@request@ \"properties\": {@@@", - "@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@", - "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"build\": {@@@", - "@@@STEP_LOG_LINE@request@ \"enabled_branches\": [@@@", - "@@@STEP_LOG_LINE@request@ \"beta\", @@@", - "@@@STEP_LOG_LINE@request@ \"main\"@@@", - "@@@STEP_LOG_LINE@request@ ], @@@", - "@@@STEP_LOG_LINE@request@ \"name\": \"linux packaging one\", @@@", - "@@@STEP_LOG_LINE@request@ \"properties\": {@@@", - "@@@STEP_LOG_LINE@request@ \"$flutter/osx_sdk\": {@@@", - "@@@STEP_LOG_LINE@request@ \"sdk_version\": \"14a5294e\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\", @@@", - "@@@STEP_LOG_LINE@request@ \"scheduler\": \"release\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"environment\": \"Staging\", @@@", - "@@@STEP_LOG_LINE@request@ \"recipe\": \"release/something\", @@@", - "@@@STEP_LOG_LINE@request@ \"repository\": \"engine\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"requestId\": \"8945511751514863184-00000000-0000-0000-0000-00000000133a\", @@@", - "@@@STEP_LOG_LINE@request@ \"swarming\": {@@@", - "@@@STEP_LOG_LINE@request@ \"parentRunId\": \"fake-task-id\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ \"tags\": [@@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"key\": \"cq_experimental\", @@@", - "@@@STEP_LOG_LINE@request@ \"value\": \"false\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"key\": \"parent_buildbucket_id\", @@@", - "@@@STEP_LOG_LINE@request@ \"value\": \"8945511751514863184\"@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"key\": \"user_agent\", @@@", - "@@@STEP_LOG_LINE@request@ \"value\": \"recipe\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ ]@@@", - "@@@STEP_LOG_LINE@request@}@@@", - "@@@STEP_LOG_END@request@@@", - "@@@STEP_LINK@8922054662172514001@https://cr-buildbucket.appspot.com/build/8922054662172514001@@@" - ] - }, - { "cmd": [], "name": "collect builds" }, @@ -542,8 +423,7 @@ "cr-buildbucket.appspot.com", "-interval", "20s", - "8945511751514863186", - "8922054662172514001" + "8945511751514863186" ], "infra_step": true, "luci_context": { @@ -585,7 +465,7 @@ } }, "name": "collect builds.collect.get", - "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8945511751514863186\"}}, {\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8922054662172514001\"}}]}", + "stdin": "{\"requests\": [{\"getBuild\": {\"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", \"id\": \"8945511751514863186\"}}]}", "~followup_annotations": [ "@@@STEP_NEST_LEVEL@2@@@", "@@@STEP_LOG_LINE@json.output@{@@@", @@ -643,12 +523,6 @@ "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", @@@", "@@@STEP_LOG_LINE@request@ \"id\": \"8945511751514863186\"@@@", "@@@STEP_LOG_LINE@request@ }@@@", - "@@@STEP_LOG_LINE@request@ }, @@@", - "@@@STEP_LOG_LINE@request@ {@@@", - "@@@STEP_LOG_LINE@request@ \"getBuild\": {@@@", - "@@@STEP_LOG_LINE@request@ \"fields\": \"builder,createTime,createdBy,critical,endTime,id,infra,infra.swarming.taskId,input,number,output,startTime,status,summaryMarkdown,updateTime\", @@@", - "@@@STEP_LOG_LINE@request@ \"id\": \"8922054662172514001\"@@@", - "@@@STEP_LOG_LINE@request@ }@@@", "@@@STEP_LOG_LINE@request@ }@@@", "@@@STEP_LOG_LINE@request@ ]@@@", "@@@STEP_LOG_LINE@request@}@@@",
diff --git a/recipes/release/release_builder.py b/recipes/release/release_builder.py index b07dcfa..551f81f 100644 --- a/recipes/release/release_builder.py +++ b/recipes/release/release_builder.py
@@ -47,8 +47,7 @@ return True # Packaging for the flutter repository. if (target.get('scheduler') == 'release' and for_this_platform - # TODO(godofredoc): Uncomment the next line after testing is complete. - # and (git_ref in RELEASE_CHANNELS) + and (git_ref in RELEASE_CHANNELS) and git_ref.replace('refs/heads/', '') in target.get('enabled_branches', []) ): return True