Revert "Update packaging configs to use cosign to sign and upload signed artifact to artifact registry"
This reverts commit 6518061ee779edb0f17355e06e635ece5e103f05.
Reason for revert: This commit is causing failures in packaging mac-arm64 binaries. Context: https://ci.chromium.org/p/flutter/g/stable_packaging/console
Original change's description:
> Update packaging configs to use cosign to sign and upload signed artifact to artifact registry
>
> Bug: b/230772081
> Change-Id: I3df63ecdab95bb08ac8c5da1755e7fb7436b5dc1
> Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/33740
> Reviewed-by: Casey Hillers <chillers@google.com>
> Reviewed-by: Godofredo Contreras <godofredoc@google.com>
> Commit-Queue: Drew Roen <drewroen@google.com>
# Not skipping CQ checks because original CL landed > 1 day ago.
Bug: b/230772081
Change-Id: I3b871504a854e7c20e4bd56b2d9368ab3204218e
Reviewed-on: https://flutter-review.googlesource.com/c/infra/+/33860
Reviewed-by: Drew Roen <drewroen@google.com>
Commit-Queue: Drew Roen <drewroen@google.com>
diff --git a/config/generated/flutter/luci/cr-buildbucket.cfg b/config/generated/flutter/luci/cr-buildbucket.cfg
index 6663a9f..293f488 100644
--- a/config/generated/flutter/luci/cr-buildbucket.cfg
+++ b/config/generated/flutter/luci/cr-buildbucket.cfg
@@ -803,17 +803,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -53361,17 +53355,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -53409,17 +53397,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -53550,17 +53532,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -53598,17 +53574,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -86850,17 +86820,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
@@ -86897,17 +86861,11 @@
' "server": "https://chromium-swarm.appspot.com"'
' },'
' "clobber": false,'
- ' "dependencies": ['
- ' {'
- ' "dependency": "cosign"'
- ' }'
- ' ],'
' "gold_tryjob": false,'
' "goma_jobs": "200",'
' "mastername": "client.flutter",'
' "recipe": "packaging/packaging",'
- ' "upload_packages": true,'
- ' "upload_with_cosign": true'
+ ' "upload_packages": true'
'}'
priority: 25
execution_timeout_secs: 3600
diff --git a/config/packaging_config.star b/config/packaging_config.star
index fc6ba50..69fba9f 100644
--- a/config/packaging_config.star
+++ b/config/packaging_config.star
@@ -151,29 +151,36 @@
# never use.
if branch in ("beta", "stable"):
# Defines framework prod builders
- common.linux_prod_builder(
- name = builder_name("Linux Flutter %s Packaging|%s", branch),
- recipe = "packaging/packaging",
- console_view_name = console_view_name,
- triggered_by = [trigger_name],
- triggering_policy = triggering_policy,
- properties = {
- "dependencies": [{"dependency": "cosign"}],
- "upload_with_cosign": True,
- },
- priority = 25,
- **platform_args["linux"]
- )
+ 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 = "packaging/packaging",
+ console_view_name = console_view_name,
+ triggered_by = [trigger_name],
+ triggering_policy = triggering_policy,
+ priority = 25,
+ **platform_args["linux"]
+ )
+ else:
+ common.linux_prod_builder(
+ name = builder_name("Linux Flutter %s Packaging|%s", branch),
+ recipe = "packaging/packaging",
+ console_view_name = console_view_name,
+ triggered_by = [trigger_name],
+ triggering_policy = triggering_policy,
+ properties = {
+ "dependencies": [{"dependency": "cosign"}],
+ "upload_with_cosign": True,
+ },
+ priority = 25,
+ **platform_args["linux"]
+ )
common.mac_prod_builder(
name = builder_name("Mac Flutter %s Packaging|%s", branch),
recipe = "packaging/packaging",
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
- properties = {
- "dependencies": [{"dependency": "cosign"}],
- "upload_with_cosign": True,
- },
priority = 25,
**platform_args["mac"]
)
@@ -183,10 +190,6 @@
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
- properties = {
- "dependencies": [{"dependency": "cosign"}],
- "upload_with_cosign": True,
- },
priority = 25,
**platform_args["mac_arm64"]
)
@@ -196,10 +199,6 @@
console_view_name = console_view_name,
triggered_by = [trigger_name],
triggering_policy = triggering_policy,
- properties = {
- "dependencies": [{"dependency": "cosign"}],
- "upload_with_cosign": True,
- },
priority = 25,
**platform_args["windows"]
)
