Update Fuchsia version + download product bundles
Bug: b/232740856
Change-Id: I9d0abf73088740062ee13a0d9e08a2e9ca7be30d
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283120
Commit-Queue: Christoffer Jansson <jansson@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#38611}
diff --git a/DEPS b/DEPS
index 2621bf5..5bbb411 100644
--- a/DEPS
+++ b/DEPS
@@ -20,11 +20,15 @@
# By default, download the fuchsia sdk from the public sdk directory.
'fuchsia_sdk_cipd_prefix': 'fuchsia/sdk/gn/',
- 'fuchsia_version': 'version:9.20220919.2.1',
+ 'fuchsia_version': 'version:10.20221110.2.1',
# By default, download the fuchsia images from the fuchsia GCS bucket.
'fuchsia_images_bucket': 'fuchsia',
- 'checkout_fuchsia_boot_images': "qemu.x64",
'checkout_fuchsia': False,
+ # Since the images are hundreds of MB, default to only downloading the image
+ # most commonly useful for developers. Bots and developers that need to use
+ # other images can override this with additional images.
+ 'checkout_fuchsia_boot_images': "terminal.qemu-x64",
+ 'checkout_fuchsia_product_bundles': '"{checkout_fuchsia_boot_images}" != ""',
# reclient CIPD package version
'reclient_version': 're_client_version:0.81.1.0853992-gomaip',
@@ -2418,16 +2422,14 @@
'--version={fuchsia_version}',
],
},
-
{
'name': 'Download Fuchsia system images',
'pattern': '.',
- 'condition': 'checkout_fuchsia',
+ 'condition': 'checkout_fuchsia and checkout_fuchsia_product_bundles',
'action': [
'python3',
- 'src/build/fuchsia/update_images.py',
- '--boot-images={checkout_fuchsia_boot_images}',
- '--default-bucket={fuchsia_images_bucket}',
+ 'src/build/fuchsia/update_product_bundles.py',
+ '{checkout_fuchsia_boot_images}',
],
},
{
