Google Git
Sign in
flutter/recipes/eeb771892796ea3a0f9d6b029944d4ddfe03f9ef^!/.
commit
eeb771892796ea3a0f9d6b029944d4ddfe03f9ef
[log]
author
Godofredo Contreras <godofredoc@google.com>
Mon Apr 10 19:27:42 2023 +0000
committer
CQ Bot Account <flutter-scoped@luci-project-accounts.iam.gserviceaccount.com>
Mon Apr 10 19:27:42 2023 +0000
tree
cf0d8a244639be4617b0bb067b5083e3943ced1e
parent
9e49e5e99d9978de8b8439c14b04c69c714e83b2 [diff]
Manual roll to update python to python3.

This is to unblock the recipes roll which expect python binary as
explicit python3.

Change-Id: I155844b822b3100cf4805c41518ce2ead451d69b
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/26071
Reviewed-by: Keyong Han <keyonghan@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/41541
Reviewed-by: Ricardo Amador <ricardoamador@google.com>

diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 21d2eb4..65f193c 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg

@@ -33,7 +33,7 @@
     },
     "recipe_engine": {
       "branch": "refs/heads/main",
-      "revision": "aed2176f4d4ca4443e655f2874069ff6d79750a8",
+      "revision": "d82cf3c7fdb30f2570a77c4f6d2e8e656cce8f99",
       "url": "https://chromium.googlesource.com/infra/luci/recipes-py.git"
     }
   },

diff --git a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
index 5f190dd..86d24b4 100644
--- a/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json
+++ b/recipe_modules/shard_util_v2/examples/full.expected/presubmit_led.json

@@ -1398,10 +1398,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {

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 a70f09c..d2165ce 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

@@ -1132,8 +1132,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CLEANUP]/results_tmp_1:results"
+      "-paths-json",
+      "[[\"[CLEANUP]/results_tmp_1\", \"results\"]]"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {

diff --git a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
index 282acf9..31d9287 100644
--- a/recipes/devicelab/devicelab_drone.expected/suppress-logs.json
+++ b/recipes/devicelab/devicelab_drone.expected/suppress-logs.json

@@ -1142,8 +1142,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CLEANUP]/results_tmp_1:results"
+      "-paths-json",
+      "[[\"[CLEANUP]/results_tmp_1\", \"results\"]]"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {

diff --git a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
index e37593e..1887e6d 100644
--- a/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json
+++ b/recipes/devicelab/devicelab_drone.expected/upload-metrics-mac.json

@@ -1955,8 +1955,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CLEANUP]/results_tmp_1:results"
+      "-paths-json",
+      "[[\"[CLEANUP]/results_tmp_1\", \"results\"]]"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {

diff --git a/recipes/devicelab/devicelab_test_drone.expected/basic.json b/recipes/devicelab/devicelab_test_drone.expected/basic.json
index 3f94b94..f625ccc 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/basic.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/basic.json

@@ -1465,8 +1465,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CLEANUP]/results_tmp_1:results"
+      "-paths-json",
+      "[[\"[CLEANUP]/results_tmp_1\", \"results\"]]"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {

diff --git a/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json b/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json
index 2b8c982..d9d41f0 100644
--- a/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json
+++ b/recipes/devicelab/devicelab_test_drone.expected/no-upload-metrics-linux-staging.json

@@ -1165,8 +1165,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CLEANUP]/results_tmp_1:results"
+      "-paths-json",
+      "[[\"[CLEANUP]/results_tmp_1\", \"results\"]]"
     ],
     "cwd": "[CLEANUP]/tmp_tmp_1/flutter sdk/dev/devicelab",
     "env": {

diff --git a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
index 61a7a29..5b33b04 100644
--- a/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json
+++ b/recipes/engine/engine_builder.expected/Schedule two builds one with goma and one without.json

@@ -1398,12 +1398,8 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
-      "-paths",
-      "[CACHE]/builder/src:out/android_debug_unopt/libflutter.so",
-      "-paths",
-      "[CACHE]/builder/src:out/host_debug_unopt/shell_unittests",
-      "-paths",
-      "[CACHE]/builder/src:out/android_debug_unopt/some_dir"
+      "-paths-json",
+      "[[\"[CACHE]/builder/src\", \"out/android_debug_unopt/libflutter.so\"], [\"[CACHE]/builder/src\", \"out/host_debug_unopt/shell_unittests\"], [\"[CACHE]/builder/src\", \"out/android_debug_unopt/some_dir\"]]"
     ],
     "cwd": "[CACHE]/builder",
     "infra_step": true,

diff --git a/recipes/engine/femu_test.expected/arm64_emulator_arch.json b/recipes/engine/femu_test.expected/arm64_emulator_arch.json
index 620a1b6..9c51ad9 100644
--- a/recipes/engine/femu_test.expected/arm64_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/arm64_emulator_arch.json

@@ -1159,7 +1159,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1314,10 +1314,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/femu_with_package_list.json b/recipes/engine/femu_test.expected/femu_with_package_list.json
index 4f6a1d7..214205c 100644
--- a/recipes/engine/femu_test.expected/femu_with_package_list.json
+++ b/recipes/engine/femu_test.expected/femu_with_package_list.json

@@ -1172,7 +1172,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1327,10 +1327,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/invalid_emulator_arch.json b/recipes/engine/femu_test.expected/invalid_emulator_arch.json
index d161ea8..db70cbb 100644
--- a/recipes/engine/femu_test.expected/invalid_emulator_arch.json
+++ b/recipes/engine/femu_test.expected/invalid_emulator_arch.json

@@ -1152,7 +1152,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1307,10 +1307,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/multiple_non_root_fars.json b/recipes/engine/femu_test.expected/multiple_non_root_fars.json
index 1e7ea7b..f8894d7 100644
--- a/recipes/engine/femu_test.expected/multiple_non_root_fars.json
+++ b/recipes/engine/femu_test.expected/multiple_non_root_fars.json

@@ -1162,7 +1162,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1317,10 +1317,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/no_zircon_file.json b/recipes/engine/femu_test.expected/no_zircon_file.json
index d161ea8..db70cbb 100644
--- a/recipes/engine/femu_test.expected/no_zircon_file.json
+++ b/recipes/engine/femu_test.expected/no_zircon_file.json

@@ -1152,7 +1152,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1307,10 +1307,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
index a77e961..e659d03 100644
--- a/recipes/engine/femu_test.expected/run_on_test_specified_arch.json
+++ b/recipes/engine/femu_test.expected/run_on_test_specified_arch.json

@@ -1190,7 +1190,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1345,10 +1345,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
index 837bbcf..3ecd005 100644
--- a/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json
+++ b/recipes/engine/femu_test.expected/run_with_dart_aot_behavior.json

@@ -1165,7 +1165,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1320,10 +1320,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/start_femu.json b/recipes/engine/femu_test.expected/start_femu.json
index 9336754..1e6d436 100644
--- a/recipes/engine/femu_test.expected/start_femu.json
+++ b/recipes/engine/femu_test.expected/start_femu.json

@@ -1164,7 +1164,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1319,10 +1319,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/femu_test.expected/start_femu_with_cso.json b/recipes/engine/femu_test.expected/start_femu_with_cso.json
index efa7fbb..335609d 100644
--- a/recipes/engine/femu_test.expected/start_femu_with_cso.json
+++ b/recipes/engine/femu_test.expected/start_femu_with_cso.json

@@ -1164,7 +1164,7 @@
   },
   {
     "cmd": [
-      "python",
+      "python3",
       "-u",
       "RECIPE_MODULE[fuchsia::cas_util]/resources/hardlink.py",
       "--link-json",
@@ -1319,10 +1319,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/femu_runfiles__tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/femu_runfiles__tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/web_engine.expected/basic.json b/recipes/engine/web_engine.expected/basic.json
index bd8f118..70c4bd7 100644
--- a/recipes/engine/web_engine.expected/basic.json
+++ b/recipes/engine/web_engine.expected/basic.json

@@ -1778,10 +1778,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
index 1a74904..1f71ceb 100644
--- a/recipes/engine/web_engine_framework.expected/linux-pre-submit.json
+++ b/recipes/engine/web_engine_framework.expected/linux-pre-submit.json

@@ -1879,10 +1879,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/cas-directory_tmp_1:."
+      "debug"
     ],
     "cwd": "[CACHE]/builder",
     "env": {

diff --git a/recipes/engine_v2/builder.expected/basic.json b/recipes/engine_v2/builder.expected/basic.json
index 3558185..f5b771b 100644
--- a/recipes/engine_v2/builder.expected/basic.json
+++ b/recipes/engine_v2/builder.expected/basic.json

@@ -403,10 +403,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {

diff --git a/recipes/engine_v2/builder.expected/dart-internal-flutter.json b/recipes/engine_v2/builder.expected/dart-internal-flutter.json
index 971ca58..2f2a6c8 100644
--- a/recipes/engine_v2/builder.expected/dart-internal-flutter.json
+++ b/recipes/engine_v2/builder.expected/dart-internal-flutter.json

@@ -510,10 +510,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {

diff --git a/recipes/engine_v2/builder.expected/mac.json b/recipes/engine_v2/builder.expected/mac.json
index 806f4d2..9ce736a 100644
--- a/recipes/engine_v2/builder.expected/mac.json
+++ b/recipes/engine_v2/builder.expected/mac.json

@@ -537,10 +537,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {

diff --git a/recipes/engine_v2/builder.expected/monorepo.json b/recipes/engine_v2/builder.expected/monorepo.json
index 08df8ed..d449b8e 100644
--- a/recipes/engine_v2/builder.expected/monorepo.json
+++ b/recipes/engine_v2/builder.expected/monorepo.json

@@ -459,10 +459,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {

diff --git a/recipes/engine_v2/builder.expected/monorepo_tryjob.json b/recipes/engine_v2/builder.expected/monorepo_tryjob.json
index 41cdeeb..67379af 100644
--- a/recipes/engine_v2/builder.expected/monorepo_tryjob.json
+++ b/recipes/engine_v2/builder.expected/monorepo_tryjob.json

@@ -543,10 +543,10 @@
       "projects/example-cas-server/instances/default_instance",
       "-dump-digest",
       "/path/to/tmp/",
+      "-paths-json",
+      "[[\"[CLEANUP]/out-cas-directory_tmp_1\", \".\"]]",
       "-log-level",
-      "debug",
-      "-paths",
-      "[CLEANUP]/out-cas-directory_tmp_1:."
+      "debug"
     ],
     "infra_step": true,
     "luci_context": {