Append buildid to monorepo artifact_url.
Follow-up to 7a21186796e7e164dd2179d992dca8fa592adc97.
Fixes https://github.com/flutter/flutter/issues/147360
Change-Id: I6b1a617a4781acb598dc46070b117fbeccda5f21
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/57300
Commit-Queue: Alexander Aprelev <aam@google.com>
Reviewed-by: Christopher Fujino <fujino@google.com>
Reviewed-by: Zach Anderson <zra@google.com>
diff --git a/recipes/engine_v2/tester.expected/monorepo.json b/recipes/engine_v2/tester.expected/monorepo.json
index 6c98990..1349fd2 100644
--- a/recipes/engine_v2/tester.expected/monorepo.json
+++ b/recipes/engine_v2/tester.expected/monorepo.json
@@ -253,6 +253,13 @@
},
{
"cmd": [],
+ "name": "get buildbucket id",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@123@@@"
+ ]
+ },
+ {
+ "cmd": [],
"name": "Checkout flutter/flutter"
},
{
@@ -507,7 +514,7 @@
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -549,7 +556,7 @@
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
index ad7df77..734336a 100644
--- a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
@@ -253,6 +253,13 @@
},
{
"cmd": [],
+ "name": "get buildbucket id",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@123@@@"
+ ]
+ },
+ {
+ "cmd": [],
"name": "Checkout flutter/flutter"
},
{
@@ -581,7 +588,7 @@
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
"GRADLE_USER_HOME": "[CACHE]/gradle",
@@ -630,7 +637,7 @@
"ANDROID_USER_HOME": "[CLEANUP]/tmp_tmp_1/.android",
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"GRADLE_OPTS": "-Dorg.gradle.daemon=false",
"GRADLE_USER_HOME": "[CACHE]/gradle",
diff --git a/recipes/engine_v2/tester.expected/monorepo_tryjob.json b/recipes/engine_v2/tester.expected/monorepo_tryjob.json
index a0c8522..74cd9fb 100644
--- a/recipes/engine_v2/tester.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/tester.expected/monorepo_tryjob.json
@@ -280,7 +280,7 @@
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try/81123491",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -322,7 +322,7 @@
"env": {
"ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try/81123491",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/engine_v2/tester.expected/monorepo_web_tests.json b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
index 1416a1a..ec184a8 100644
--- a/recipes/engine_v2/tester.expected/monorepo_web_tests.json
+++ b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
@@ -253,6 +253,13 @@
},
{
"cmd": [],
+ "name": "get buildbucket id",
+ "~followup_annotations": [
+ "@@@STEP_TEXT@123@@@"
+ ]
+ },
+ {
+ "cmd": [],
"name": "Checkout flutter/flutter"
},
{
@@ -595,7 +602,7 @@
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
@@ -641,7 +648,7 @@
"CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome",
"CHROME_NO_SANDBOX": "true",
"DEPOT_TOOLS": "RECIPE_REPO[depot_tools]",
- "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo",
+ "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123",
"GIT_BRANCH": "",
"LUCI_BRANCH": "",
"LUCI_CI": "True",
diff --git a/recipes/engine_v2/tester.py b/recipes/engine_v2/tester.py
index 0f6b5ed..d2a4cb2 100644
--- a/recipes/engine_v2/tester.py
+++ b/recipes/engine_v2/tester.py
@@ -90,11 +90,11 @@
flutter = builder.join('flutter')
if api.monorepo.is_monorepo_try_build:
framework_ref = 'refs/heads/main'
- artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo_try'
+ artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo_try/%s' % api.monorepo.build_identifier
engine_version = api.monorepo.build_identifier
elif api.monorepo.is_monorepo_ci_build:
framework_ref = get_monorepo_framework(api)
- artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo'
+ artifact_url = 'https://storage.googleapis.com/flutter_archives_v2/monorepo/%s' % api.monorepo.build_identifier
engine_version = api.buildbucket.gitiles_commit.id
else:
framework_ref = 'refs/heads/master'
