Pin vpython
Change-Id: Iafdcb1a07c0f5b818d7cb31a84a2307679d3cbf4
Bug: https://github.com/flutter/flutter/issues/110112
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/32820
Commit-Queue: Keyong Han <keyonghan@google.com>
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/devicelab/devicelab_drone.expected/basic.json b/recipes/devicelab/devicelab_drone.expected/basic.json
index 10148b6..80ea408 100644
--- a/recipes/devicelab/devicelab_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_drone.expected/basic.json
@@ -532,7 +532,7 @@
"-root",
"[CLEANUP]/tmp_tmp_3/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -557,7 +557,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/local-engine.json b/recipes/devicelab/devicelab_drone.expected/local-engine.json
index b714e40..3a530c9 100644
--- a/recipes/devicelab/devicelab_drone.expected/local-engine.json
+++ b/recipes/devicelab/devicelab_drone.expected/local-engine.json
@@ -476,7 +476,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -501,7 +501,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
index 932b0d5..7862b52 100644
--- a/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
+++ b/recipes/devicelab/devicelab_drone.expected/no-upload-metrics-linux-staging.json
@@ -337,7 +337,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -362,7 +362,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/post-submit.json b/recipes/devicelab/devicelab_drone.expected/post-submit.json
index 282dbb3..96ad31e 100644
--- a/recipes/devicelab/devicelab_drone.expected/post-submit.json
+++ b/recipes/devicelab/devicelab_drone.expected/post-submit.json
@@ -337,7 +337,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -362,7 +362,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
index 080d968..cfe682c 100644
--- a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
+++ b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
@@ -532,7 +532,7 @@
"-root",
"[CLEANUP]/tmp_tmp_3/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -557,7 +557,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index 54590e1..1152ea0 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
@@ -376,7 +376,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -401,7 +401,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
index c112a3b..79228b0 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-chromium-mac.json
@@ -376,7 +376,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -401,7 +401,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
index 4bd60d0..53cd820 100644
--- a/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
+++ b/recipes/devicelab/devicelab_drone.expected/xcode-devicelab.json
@@ -376,7 +376,7 @@
"-root",
"[CLEANUP]/tmp_tmp_2/vpython",
"-ensure-file",
- "infra/tools/luci/vpython/${platform} latest",
+ "infra/tools/luci/vpython/${platform} git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601",
"-max-threads",
"0",
"-json-output",
@@ -401,7 +401,7 @@
"@@@STEP_LOG_LINE@json.output@ \"result\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"\": [@@@",
"@@@STEP_LOG_LINE@json.output@ {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-latest----------\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-git_revision:9d1\", @@@",
"@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/luci/vpython/resolved-platform\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ ]@@@",
diff --git a/recipes/devicelab/devicelab_drone.py b/recipes/devicelab/devicelab_drone.py
index ee4523c..41dea58 100644
--- a/recipes/devicelab/devicelab_drone.py
+++ b/recipes/devicelab/devicelab_drone.py
@@ -83,7 +83,7 @@
# TODO: If deps contains dart_sdk and we are running a local engine,
# we don't want to fetch it with cipd, so don't fetch it with required_deps
api.flutter_deps.required_deps(env, env_prefixes, deps)
- api.flutter_deps.vpython(env, env_prefixes, 'latest')
+ api.flutter_deps.vpython(env, env_prefixes, 'git_revision:9d1c6e6f932c9eaef34e3170c09080c7a1aec601')
target_tags = api.properties.get('tags', [])
device_tags = api.test_utils.collect_benchmark_tags(env, env_prefixes, target_tags)
