[packaging] Use main recipes ref
Packaging should always use the tip of tree
for everything that is not the artifacts.
Bug: https://github.com/flutter/flutter/issues/106446
Change-Id: Ibb9f1dd56cb8dc26dbfb00bd8eb0db8f92e76a0e
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/31460
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Casey Hillers <chillers@google.com>
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 764f5e9..7ea40e5 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -794,7 +794,7 @@
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/flutter-2.13-candidate.2"
+ cipd_version: "refs/heads/main"
cmd: "luciexe"
}
properties:
@@ -52329,7 +52329,7 @@
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/flutter-2.13-candidate.2"
+ cipd_version: "refs/heads/main"
cmd: "luciexe"
}
properties:
@@ -52475,7 +52475,7 @@
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/flutter-2.13-candidate.2"
+ cipd_version: "refs/heads/main"
cmd: "luciexe"
}
properties:
@@ -82983,7 +82983,7 @@
dimensions: "pool:luci.flutter.prod"
exe {
cipd_package: "flutter/recipe_bundles/flutter.googlesource.com/recipes"
- cipd_version: "refs/heads/flutter-2.13-candidate.2"
+ cipd_version: "refs/heads/main"
cmd: "luciexe"
}
properties:
diff --git a/config/generated/flutter/luci/project.cfg b/config/generated/flutter/luci/project.cfg
index 61da59d..1b70f14 100644
--- a/config/generated/flutter/luci/project.cfg
+++ b/config/generated/flutter/luci/project.cfg
@@ -7,7 +7,7 @@
name: "flutter"
access: "group:all"
lucicfg {
- version: "1.30.11"
+ version: "1.30.10"
package_dir: "../../.."
config_dir: "generated/flutter/luci"
entry_point: "main.star"
diff --git a/config/packaging_config.star b/config/packaging_config.star
index f5182ba..69fba9f 100644
--- a/config/packaging_config.star
+++ b/config/packaging_config.star
@@ -50,21 +50,23 @@
"os": WINDOWS_OS,
},
}
-
- packaging_recipe("packaging/packaging", branches.stable.recipes_ref)
+ luci.recipe(
+ name = "packaging/packaging",
+ recipe = "packaging/packaging",
+ cipd_package = "flutter/recipe_bundles/flutter.googlesource.com/recipes",
+ cipd_version = branches.main.recipes_ref,
+ use_bbagent = True,
+ )
packaging_prod_config(
platform_args,
"stable",
branches.stable.release_ref,
- branches.stable.recipes_ref,
)
- packaging_recipe("packaging/packaging", branches.beta.recipes_ref)
packaging_prod_config(
platform_args,
"beta",
branches.beta.release_ref,
- branches.beta.recipes_ref,
)
packaging_prod_config(
@@ -73,22 +75,12 @@
# Note for master, there is no distinction between testing_ref &
# release_ref
"refs/heads/master",
- branches.master.recipes_ref,
)
def builder_name(pattern, branch):
return pattern % (branch.capitalize(), branch)
-def packaging_recipe(name, recipes_ref):
- luci.recipe(
- name = common.full_recipe_name(name, recipes_ref),
- recipe = name,
- cipd_package = "flutter/recipe_bundles/flutter.googlesource.com/recipes",
- cipd_version = recipes_ref,
- use_bbagent = True,
- )
-
-def packaging_prod_config(platform_args, branch, ref, recipes_ref):
+def packaging_prod_config(platform_args, branch, ref):
"""Prod configurations for packaging flutter framework artifacts.
Args:
@@ -96,7 +88,6 @@
key.
branch(str): The branch name we are creating configurations for.
ref(str): The git ref we are creating configurations for.
- recipes_ref(str): The git ref used to select the recipes package.
"""
# TODO(chillers): Migrate packaging builders to ci.yaml. https://github.com/flutter/flutter/issues/100806
@@ -163,7 +154,7 @@
if branch == "stable": # TODO(drewroen): Remove the branch check for linux flutter packaging when cosign is determined to work correctly
common.linux_prod_builder(
name = builder_name("Linux Flutter %s Packaging|%s", branch),
- recipe = common.full_recipe_name("packaging/packaging", recipes_ref),
+ recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
@@ -173,7 +164,7 @@
else:
common.linux_prod_builder(
name = builder_name("Linux Flutter %s Packaging|%s", branch),
- recipe = common.full_recipe_name("packaging/packaging", recipes_ref),
+ recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
@@ -186,7 +177,7 @@
)
common.mac_prod_builder(
name = builder_name("Mac Flutter %s Packaging|%s", branch),
- recipe = common.full_recipe_name("packaging/packaging", recipes_ref),
+ recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
@@ -195,7 +186,7 @@
)
common.mac_prod_builder(
name = builder_name("Mac Arm64 Flutter %s Packaging|%s", branch),
- recipe = common.full_recipe_name("packaging/packaging", recipes_ref),
+ recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
@@ -204,7 +195,7 @@
)
common.windows_prod_builder(
name = builder_name("Windows Flutter %s Packaging|%s", branch),
- recipe = common.full_recipe_name("packaging/packaging", recipes_ref),
+ recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
