From 38c83426631ac5b17ecea21c252027b981205414 Mon Sep 17 00:00:00 2001 From: Ricardo Amador Date: Fri, 26 Jan 2024 13:27:08 -0800 Subject: [PATCH 1/2] Added changes to use the android emulator proto config as the version. --- ci/builders/linux_android_emulator.json | 24 ++++++++++++++----- .../linux_android_emulator_api_33.json | 12 ++++++++-- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index bc5217a92c7ac..bfcc82da76b3b 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -31,8 +31,12 @@ "name": "Android Unit Tests", "test_dependencies": [ { - "dependency": "android_virtual_device", - "version": "34" + "dependency": "android_virtual_device", + "version": "android_34_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" } ], "contexts": [ @@ -51,8 +55,12 @@ "name": "Scenario App Integration Tests", "test_dependencies": [ { - "dependency": "android_virtual_device", - "version": "34" + "dependency": "android_virtual_device", + "version": "android_34_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" } ], "contexts": [ @@ -95,8 +103,12 @@ "name": "Android Unit Tests (API 28)", "test_dependencies": [ { - "dependency": "android_virtual_device", - "version": "28" + "dependency": "android_virtual_device", + "version": "android_28_google_apis_x86.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" } ], "contexts": [ diff --git a/ci/builders/linux_android_emulator_api_33.json b/ci/builders/linux_android_emulator_api_33.json index e676858361d5c..2d42f096df3b8 100644 --- a/ci/builders/linux_android_emulator_api_33.json +++ b/ci/builders/linux_android_emulator_api_33.json @@ -32,7 +32,11 @@ "test_dependencies": [ { "dependency": "android_virtual_device", - "version": "33" + "version": "android_33_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" } ], "contexts": [ @@ -52,7 +56,11 @@ "test_dependencies": [ { "dependency": "android_virtual_device", - "version": "33" + "version": "android_33_google_apis_x64.textpb" + }, + { + "dependency": "avd_cipd_version", + "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" } ], "contexts": [ From f35a22b7e4a0ba68a24e7f26704811f708cbcdac Mon Sep 17 00:00:00 2001 From: Ricardo Amador Date: Thu, 1 Feb 2024 11:10:24 -0800 Subject: [PATCH 2/2] Update the package to use build_id to avoid blocking tree on rollers. --- ci/builders/linux_android_emulator.json | 6 +++--- ci/builders/linux_android_emulator_api_33.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/builders/linux_android_emulator.json b/ci/builders/linux_android_emulator.json index bfcc82da76b3b..4ef64af57e506 100644 --- a/ci/builders/linux_android_emulator.json +++ b/ci/builders/linux_android_emulator.json @@ -36,7 +36,7 @@ }, { "dependency": "avd_cipd_version", - "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" + "version": "build_id:8759428741582061553" } ], "contexts": [ @@ -60,7 +60,7 @@ }, { "dependency": "avd_cipd_version", - "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" + "version": "build_id:8759428741582061553" } ], "contexts": [ @@ -108,7 +108,7 @@ }, { "dependency": "avd_cipd_version", - "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" + "version": "build_id:8759428741582061553" } ], "contexts": [ diff --git a/ci/builders/linux_android_emulator_api_33.json b/ci/builders/linux_android_emulator_api_33.json index 2d42f096df3b8..3e518f1ab40d6 100644 --- a/ci/builders/linux_android_emulator_api_33.json +++ b/ci/builders/linux_android_emulator_api_33.json @@ -36,7 +36,7 @@ }, { "dependency": "avd_cipd_version", - "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" + "version": "build_id:8759428741582061553" } ], "contexts": [ @@ -60,7 +60,7 @@ }, { "dependency": "avd_cipd_version", - "version": "SjJFjwg1rz5dh2xdLMSPqU6MF4ipvATxpiQ_gCOyTOgC" + "version": "build_id:8759428741582061553" } ], "contexts": [