Follow-up to rename of FLUTTER_ENGINE_VERSION env variable. This is to fix broken flutter hh builtder https://ci.chromium.org/ui/p/dart/builders/ci.sandbox/flutter-linux-flutter-plugins/7059 Fixed led build https://ci.chromium.org/b/8724628196311960721 https://github.com/flutter/flutter/commit/a3f0704f25f0690fbd0228c447ab047e49df6f9d is where environment variable was renamed. Change-Id: Ibae6fc7f40d299f166489e4d69cb08282d524758 Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/62560 Commit-Queue: Alexander Thomas <athom@google.com> Reviewed-by: Alexander Thomas <athom@google.com>
diff --git a/recipes/engine_v2/tester.expected/engine.json b/recipes/engine_v2/tester.expected/engine.json index 3342627..9009d3f 100644 --- a/recipes/engine_v2/tester.expected/engine.json +++ b/recipes/engine_v2/tester.expected/engine.json
@@ -430,7 +430,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "12345", + "FLUTTER_PREBUILT_ENGINE_VERSION": "12345", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/81123491", "GIT_BRANCH": "", "LUCI_BRANCH": "", @@ -473,7 +473,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "12345", + "FLUTTER_PREBUILT_ENGINE_VERSION": "12345", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/81123491", "GIT_BRANCH": "", "LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/tester.expected/monorepo.json b/recipes/engine_v2/tester.expected/monorepo.json index 5e2cd96..a8e7cbd 100644 --- a/recipes/engine_v2/tester.expected/monorepo.json +++ b/recipes/engine_v2/tester.expected/monorepo.json
@@ -664,7 +664,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "LUCI_BRANCH": "", @@ -707,7 +707,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json index a8849e0..758e318 100644 --- a/recipes/engine_v2/tester.expected/monorepo_framework_tests.json +++ b/recipes/engine_v2/tester.expected/monorepo_framework_tests.json
@@ -739,7 +739,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_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "GRADLE_OPTS": "-Dorg.gradle.daemon=false", @@ -789,7 +789,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_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "GRADLE_OPTS": "-Dorg.gradle.daemon=false",
diff --git a/recipes/engine_v2/tester.expected/monorepo_tryjob.json b/recipes/engine_v2/tester.expected/monorepo_tryjob.json index ecfe460..d678c85 100644 --- a/recipes/engine_v2/tester.expected/monorepo_tryjob.json +++ b/recipes/engine_v2/tester.expected/monorepo_tryjob.json
@@ -430,7 +430,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "81123491", + "FLUTTER_PREBUILT_ENGINE_VERSION": "81123491", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try/81123491", "GIT_BRANCH": "", "LUCI_BRANCH": "", @@ -473,7 +473,7 @@ "env": { "ARTIFACT_HUB_REPOSITORY": "artifactregistry://us-maven.pkg.dev/artifact-foundry-prod/maven-3p", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "81123491", + "FLUTTER_PREBUILT_ENGINE_VERSION": "81123491", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo_try/81123491", "GIT_BRANCH": "", "LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/tester.expected/monorepo_web_tests.json b/recipes/engine_v2/tester.expected/monorepo_web_tests.json index a940a25..6729f8d 100644 --- a/recipes/engine_v2/tester.expected/monorepo_web_tests.json +++ b/recipes/engine_v2/tester.expected/monorepo_web_tests.json
@@ -754,7 +754,7 @@ "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome", "CHROME_NO_SANDBOX": "true", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "LUCI_BRANCH": "", @@ -801,7 +801,7 @@ "CHROME_EXECUTABLE": "[CACHE]/chrome/chrome/chrome", "CHROME_NO_SANDBOX": "true", "DEPOT_TOOLS": "RECIPE_REPO[depot_tools]", - "FLUTTER_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", + "FLUTTER_PREBUILT_ENGINE_VERSION": "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "FLUTTER_STORAGE_BASE_URL": "https://storage.googleapis.com/flutter_archives_v2/monorepo/123", "GIT_BRANCH": "", "LUCI_BRANCH": "",
diff --git a/recipes/engine_v2/tester.py b/recipes/engine_v2/tester.py index 5c03ab2..30bd56f 100644 --- a/recipes/engine_v2/tester.py +++ b/recipes/engine_v2/tester.py
@@ -127,7 +127,7 @@ shard_name = '%s %s' % (shard, subshard) else: shard_name = shard - env['FLUTTER_ENGINE_VERSION'] = engine_version + env['FLUTTER_PREBUILT_ENGINE_VERSION'] = engine_version env['FLUTTER_STORAGE_BASE_URL'] = artifact_url with api.context(env=env, env_prefixes=env_prefixes, cwd=flutter): api.retry.step(