Roll fuchsia dep to use python3 fix in recipes-py.
Change-Id: Ie3b7e6536d6486cdc01f6ce1625da00308b99b0d
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/41543
Reviewed-by: Yusuf Mohsinally <mohsinally@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/infra/config/recipes.cfg b/infra/config/recipes.cfg
index 65f193c..1b2710f 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -28,7 +28,7 @@
},
"fuchsia": {
"branch": "refs/heads/main",
- "revision": "1df9b862000475e7ee2699a888ca951de4cb3b30",
+ "revision": "63264deec0b1b198c94a68c34fa099de0a4bd61b",
"url": "https://fuchsia.googlesource.com/infra/recipes.git"
},
"recipe_engine": {
diff --git a/recipe_modules/status_reporting/examples/full.expected/basic.json b/recipe_modules/status_reporting/examples/full.expected/basic.json
index 4b7ec7a..b08e2a0 100644
--- a/recipe_modules/status_reporting/examples/full.expected/basic.json
+++ b/recipe_modules/status_reporting/examples/full.expected/basic.json
@@ -89,8 +89,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"pubsub",
"topics",
"publish",
diff --git a/recipes/contrib/salt_packer.expected/ci_failure.json b/recipes/contrib/salt_packer.expected/ci_failure.json
index 9063834..a0e4d35 100644
--- a/recipes/contrib/salt_packer.expected/ci_failure.json
+++ b/recipes/contrib/salt_packer.expected/ci_failure.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[START_DIR]/dash-internal-salt",
diff --git a/recipes/contrib/salt_packer.expected/ci_success.json b/recipes/contrib/salt_packer.expected/ci_success.json
index b8c5f5c..f98d3cb 100644
--- a/recipes/contrib/salt_packer.expected/ci_success.json
+++ b/recipes/contrib/salt_packer.expected/ci_success.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[START_DIR]/dash-internal-salt",
diff --git a/recipes/contrib/salt_packer.expected/try_failure.json b/recipes/contrib/salt_packer.expected/try_failure.json
index b8ec115..f6e55de 100644
--- a/recipes/contrib/salt_packer.expected/try_failure.json
+++ b/recipes/contrib/salt_packer.expected/try_failure.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[START_DIR]/dash-internal-salt",
diff --git a/recipes/contrib/salt_packer.expected/try_success.json b/recipes/contrib/salt_packer.expected/try_success.json
index 719e29d..9c2b3b3 100644
--- a/recipes/contrib/salt_packer.expected/try_success.json
+++ b/recipes/contrib/salt_packer.expected/try_success.json
@@ -493,6 +493,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -612,6 +614,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"main"
],
@@ -1073,6 +1077,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -1192,6 +1198,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"refs/changes/56/123456/7"
],
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
index 9c3b448..3fda996 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/get_latest_failure.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[START_DIR]/dash-internal-salt",
@@ -788,8 +792,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"compute",
"images",
"describe-from-family",
diff --git a/recipes/contrib/salt_packer_base_image_roller.expected/update.json b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
index 262044a..f3dc6b5 100644
--- a/recipes/contrib/salt_packer_base_image_roller.expected/update.json
+++ b/recipes/contrib/salt_packer_base_image_roller.expected/update.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/dash-internal.googlesource.com-salt",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[START_DIR]/dash-internal-salt",
@@ -788,8 +792,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"compute",
"images",
"describe-from-family",
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index f6ca658..c854f99 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -321,8 +321,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"--quiet",
"config",
"set",
@@ -386,8 +385,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -464,8 +462,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -658,9 +655,6 @@
},
{
"cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
"[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
"-o",
"GSUtil:software_update_check_period=0",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json
index 8cc5791..0a4e950 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -321,8 +321,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"--quiet",
"config",
"set",
@@ -386,8 +385,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -433,8 +431,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -511,8 +508,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -705,9 +701,6 @@
},
{
"cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
"[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
"-o",
"GSUtil:software_update_check_period=0",
diff --git a/recipes/firebaselab/firebaselab.expected/failure 15.json b/recipes/firebaselab/firebaselab.expected/failure 15.json
index 8cc5791..0a4e950 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 15.json
@@ -321,8 +321,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"--quiet",
"config",
"set",
@@ -386,8 +385,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -433,8 +431,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -511,8 +508,7 @@
},
{
"cmd": [
- "python",
- "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/lib/gcloud.py",
+ "[START_DIR]/cipd_tool/path/to/gcloud/version%3Apinned-version/bin/gcloud",
"firebase",
"test",
"android",
@@ -705,9 +701,6 @@
},
{
"cmd": [
- "vpython",
- "-vpython-spec",
- "RECIPE_MODULE[fuchsia::gsutil]/resources/gsutil.vpython",
"[START_DIR]/cipd_tool/path/to/gsutil/version%3Apinned-version/gsutil",
"-o",
"GSUtil:software_update_check_period=0",
diff --git a/recipes/infra/luci_config.expected/basic.json b/recipes/infra/luci_config.expected/basic.json
index b5a8981..ab878c9 100644
--- a/recipes/infra/luci_config.expected/basic.json
+++ b/recipes/infra/luci_config.expected/basic.json
@@ -195,6 +195,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-infra",
@@ -266,6 +268,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"main"
],
diff --git a/recipes/infra/luci_config.expected/cq.json b/recipes/infra/luci_config.expected/cq.json
index 1324714..cd67b7c 100644
--- a/recipes/infra/luci_config.expected/cq.json
+++ b/recipes/infra/luci_config.expected/cq.json
@@ -327,6 +327,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-infra",
@@ -446,6 +448,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"main"
],
diff --git a/recipes/recipes.expected/ci.json b/recipes/recipes.expected/ci.json
index f02bbe3..08df3e1 100644
--- a/recipes/recipes.expected/ci.json
+++ b/recipes/recipes.expected/ci.json
@@ -493,6 +493,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-recipes",
@@ -612,6 +614,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"main"
],
@@ -1073,6 +1077,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-recipes",
@@ -1192,6 +1198,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"refs/changes/56/123456/7"
],
diff --git a/recipes/recipes.expected/cq_try.json b/recipes/recipes.expected/cq_try.json
index f02bbe3..08df3e1 100644
--- a/recipes/recipes.expected/cq_try.json
+++ b/recipes/recipes.expected/cq_try.json
@@ -493,6 +493,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-recipes",
@@ -612,6 +614,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"main"
],
@@ -1073,6 +1077,8 @@
"fetch",
"--prune",
"--tags",
+ "--jobs",
+ "4",
"origin"
],
"cwd": "[CACHE]/git/flutter.googlesource.com-recipes",
@@ -1192,6 +1198,8 @@
"git",
"fetch",
"--tags",
+ "--jobs",
+ "4",
"origin",
"refs/changes/56/123456/7"
],
