Test new p12 and cert created today on a old release branch.
Changing the p12 and p12 password file names we fetch from KMS
Change-Id: I5a314702eb3cb087c71e8d56c21497a7a4ec4b5b
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/56640
Reviewed-by: Christopher Fujino <fujino@google.com>
Commit-Queue: Xilai Zhang <xilaizhang@google.com>
diff --git a/recipe_modules/signing/api.py b/recipe_modules/signing/api.py
index 18727b5..d42e157 100644
--- a/recipe_modules/signing/api.py
+++ b/recipe_modules/signing/api.py
@@ -72,8 +72,8 @@
with self.m.step.nest('Setup codesign environment'):
secrets_dict = {
'FLUTTER_P12':
- 'flutter_p12.encrypted', 'FLUTTER_P12_PASSWORD':
- 'p12_password.encrypted', 'CODESIGN_TEAM_ID':
+ 'exported_p12.encrypted', 'FLUTTER_P12_PASSWORD':
+ '0325_p12password.encrypted', 'CODESIGN_TEAM_ID':
'codesign_team_id.encrypted',
'CODESIGN_APP_SPECIFIC_PASSWORD':
'codesign_app_specific_password.encrypted',
diff --git a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
index e8b23ad..aa1ba93 100644
--- a/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
+++ b/recipe_modules/signing/examples/code_sign.expected/mac_require_signing.json
@@ -81,8 +81,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter_p12.encrypted",
- "[CLEANUP]/flutter_p12.encrypted"
+ "gs://flutter_configs/exported_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted"
],
"infra_step": true,
"name": "Setup codesign environment.gsutil download",
@@ -95,7 +95,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -143,8 +143,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/p12_password.encrypted",
- "[CLEANUP]/p12_password.encrypted"
+ "gs://flutter_configs/0325_p12password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted"
],
"infra_step": true,
"name": "Setup codesign environment.gsutil download (2)",
@@ -157,7 +157,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/p12_password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
diff --git a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
index e8b23ad..aa1ba93 100644
--- a/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
+++ b/recipe_modules/signing/examples/code_sign.expected/no_signing_identity.json
@@ -81,8 +81,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter_p12.encrypted",
- "[CLEANUP]/flutter_p12.encrypted"
+ "gs://flutter_configs/exported_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted"
],
"infra_step": true,
"name": "Setup codesign environment.gsutil download",
@@ -95,7 +95,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -143,8 +143,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/p12_password.encrypted",
- "[CLEANUP]/p12_password.encrypted"
+ "gs://flutter_configs/0325_p12password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted"
],
"infra_step": true,
"name": "Setup codesign environment.gsutil download (2)",
@@ -157,7 +157,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/p12_password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 4e6ec81..7409a93 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json
@@ -3733,8 +3733,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter_p12.encrypted",
- "[CLEANUP]/flutter_p12.encrypted"
+ "gs://flutter_configs/exported_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -3789,7 +3789,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -3921,8 +3921,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/p12_password.encrypted",
- "[CLEANUP]/p12_password.encrypted"
+ "gs://flutter_configs/0325_p12password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted"
],
"cwd": "[CACHE]/builder/src/flutter",
"env": {
@@ -3977,7 +3977,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/p12_password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
diff --git a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
index a10df7c..99c091b 100644
--- a/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
+++ b/recipes/engine_v2/engine_v2.expected/codesign_release_branch.json
@@ -1867,8 +1867,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/flutter_p12.encrypted",
- "[CLEANUP]/flutter_p12.encrypted"
+ "gs://flutter_configs/exported_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted"
],
"infra_step": true,
"luci_context": {
@@ -1893,7 +1893,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/flutter_p12.encrypted",
+ "[CLEANUP]/exported_p12.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
@@ -1965,8 +1965,8 @@
"RECIPE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "gs://flutter_configs/p12_password.encrypted",
- "[CLEANUP]/p12_password.encrypted"
+ "gs://flutter_configs/0325_p12password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted"
],
"infra_step": true,
"luci_context": {
@@ -1991,7 +1991,7 @@
"[START_DIR]/cloudkms/cloudkms",
"decrypt",
"-input",
- "[CLEANUP]/p12_password.encrypted",
+ "[CLEANUP]/0325_p12password.encrypted",
"-output",
"[CLEANUP]/FLUTTER_P12_PASSWORD",
"projects/flutter-infra-staging/locations/global/keyRings/luci/cryptoKeys/flutter-infra"
