|
103 | 103 | "os": ["ubuntu-latest", "macos-12", "windows-latest"],
|
104 | 104 | "platform": ["Desktop", "Android", "iOS", "tvOS"],
|
105 | 105 | "ssl_lib": ["openssl"],
|
106 |
| - "android_device": ["android_target", "emulator_target"], |
| 106 | + "android_device": ["android_target", "emulator_ftl_target"], |
107 | 107 | "ios_device": ["ios_target", "simulator_target"],
|
108 | 108 | "tvos_device": ["tvos_simulator"],
|
109 | 109 | "build_type": ["Debug"],
|
|
125 | 125 |
|
126 | 126 | EXPANDED_KEY: {
|
127 | 127 | "ssl_lib": ["openssl", "boringssl"],
|
128 |
| - "android_device": ["android_target", "android_latest", "emulator_target", "emulator_latest", "emulator_32bit"], |
| 128 | + "android_device": ["android_target", "android_latest", "emulator_ftl_target", "emulator_ftl_latest"], |
129 | 129 | "ios_device": ["ios_min", "ios_target", "ios_latest", "simulator_min", "simulator_target", "simulator_latest"],
|
130 | 130 | "tvos_device": ["tvos_simulator"],
|
131 | 131 | "architecture_windows_linux": ["x64", "x86"],
|
|
165 | 165 | # gcloud firebase test android models list
|
166 | 166 | # gcloud firebase test ios models list
|
167 | 167 | TEST_DEVICES = {
|
168 |
| - "android_min": {"type": "real", "device": "model=Nexus10,version=19"}, |
169 |
| - "android_target": {"type": "real", "device": "model=blueline,version=28"}, |
170 |
| - "android_latest": {"type": "real", "device": "model=oriole,version=33"}, |
171 |
| - "emulator_min": {"type": "virtual", "image":"system-images;android-18;google_apis;x86"}, |
| 168 | + "android_target": {"type": "ftl", "device": "model=blueline,version=28"}, |
| 169 | + "android_latest": {"type": "ftl", "device": "model=oriole,version=33"}, |
| 170 | + "emulator_ftl_target": {"type": "ftl", "device": "model=Pixel2,version=28"}, |
| 171 | + "emulator_ftl_latest": {"type": "ftl", "device": "model=Pixel2.arm,version=33"}, |
172 | 172 | "emulator_target": {"type": "virtual", "image":"system-images;android-30;google_apis;x86_64"},
|
173 | 173 | "emulator_latest": {"type": "virtual", "image":"system-images;android-32;google_apis;x86_64"},
|
174 | 174 | "emulator_32bit": {"type": "virtual", "image":"system-images;android-30;google_apis;x86"},
|
175 |
| - "ios_min": {"type": "real", "device": "model=iphonexr,version=13.2"}, |
176 |
| - "ios_target": {"type": "real", "device": "model=iphone8,version=13.6"}, |
177 |
| - "ios_latest": {"type": "real", "device": "model=iphone11pro,version=14.7"}, |
| 175 | + "ios_min": {"type": "ftl", "device": "model=iphonexr,version=13.2"}, |
| 176 | + "ios_target": {"type": "ftl", "device": "model=iphone8,version=13.6"}, |
| 177 | + "ios_latest": {"type": "ftl", "device": "model=iphone11pro,version=14.7"}, |
178 | 178 | "simulator_min": {"type": "virtual", "name":"iPhone 8", "version":"13.7"},
|
179 | 179 | "simulator_target": {"type": "virtual", "name":"iPhone 8", "version":"14.5"},
|
180 | 180 | "simulator_latest": {"type": "virtual", "name":"iPhone 11", "version":"15.2"},
|
@@ -222,6 +222,7 @@ def get_value(workflow, test_matrix, parm_key, config_parms_only=False):
|
222 | 222 | def filter_devices(devices, device_type):
|
223 | 223 | """ Filter device by device_type
|
224 | 224 | """
|
| 225 | + device_type = device_type.replace("real","ftl") |
225 | 226 | filtered_value = filter(lambda device: TEST_DEVICES.get(device).get("type") in device_type, devices)
|
226 | 227 | return list(filtered_value)
|
227 | 228 |
|
@@ -373,7 +374,7 @@ def main():
|
373 | 374 | else:
|
374 | 375 | test_matrix = ""
|
375 | 376 | value = get_value(args.workflow, test_matrix, args.parm_key, args.config)
|
376 |
| - if args.workflow == "integration_tests" and (args.parm_key == "android_device" or args.parm_key == "ios_device"): |
| 377 | + if args.workflow == "integration_tests" and args.parm_key == "ios_device": |
377 | 378 | value = filter_devices(value, args.device_type)
|
378 | 379 | if args.auto_diff:
|
379 | 380 | value = filter_values_on_diff(args.parm_key, value, args.auto_diff)
|
|
0 commit comments