Revert "Update emulators/devices used in android framework testing to cover full set of api levels"
This reverts commit 713f55778d38010e96c0d97d8da0d9d488850c63.
Reason for revert: Closed the tree.
Original change's description:
> Update emulators/devices used in android framework testing to cover full set of api levels
>
> Bug: https://github.com/flutter/flutter/issues/127682
> Change-Id: I63f04ef723e5938040d94b4ef1ea574a6d056b67
> Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/45048
> Commit-Queue: Reid Baker <reidbaker@google.com>
> Reviewed-by: Godofredo Contreras <godofredoc@google.com>
TBR=godofredoc@google.com,flutter-scoped@luci-project-accounts.iam.gserviceaccount.com,reidbaker@google.com,ricardoamador@google.com
Change-Id: I19298bda03a61d0e4125fc630a75147b89d0adbf
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: https://github.com/flutter/flutter/issues/127682
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/45181
Commit-Queue: Reid Baker <reidbaker@google.com>
Reviewed-by: Reid Baker <reidbaker@google.com>
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index 48afb5d..af7eb9b 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -401,9 +401,7 @@
"--device",
"model=redfin,version=30",
"--device",
- "model=griffin,version=24",
- "--device",
- "model=oriole,version=33"
+ "model=griffin,version=24"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
"env": {
@@ -486,13 +484,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=28",
- "--device",
- "model=NexusLowRes,version=29",
- "--device",
- "model=SmallPhone.arm,version=31",
- "--device",
- "model=SmallPhone.arm,version=32"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
"env": {
diff --git a/recipes/firebaselab/firebaselab.expected/failure 10.json b/recipes/firebaselab/firebaselab.expected/failure 10.json
index b439074..488fdcd 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -400,9 +400,7 @@
"--device",
"model=redfin,version=30",
"--device",
- "model=griffin,version=24",
- "--device",
- "model=oriole,version=33"
+ "model=griffin,version=24"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
index 1ee1d4a..f6b7416 100644
--- a/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
+++ b/recipes/firebaselab/firebaselab.expected/succeed_on_infra_failure.json
@@ -402,9 +402,7 @@
"--device",
"model=redfin,version=30",
"--device",
- "model=griffin,version=24",
- "--device",
- "model=oriole,version=33"
+ "model=griffin,version=24"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
@@ -448,9 +446,7 @@
"--device",
"model=redfin,version=30",
"--device",
- "model=griffin,version=24",
- "--device",
- "model=oriole,version=33"
+ "model=griffin,version=24"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
@@ -494,9 +490,7 @@
"--device",
"model=redfin,version=30",
"--device",
- "model=griffin,version=24",
- "--device",
- "model=oriole,version=33"
+ "model=griffin,version=24"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
@@ -580,13 +574,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=28",
- "--device",
- "model=NexusLowRes,version=29",
- "--device",
- "model=SmallPhone.arm,version=31",
- "--device",
- "model=SmallPhone.arm,version=32"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab.py b/recipes/firebaselab/firebaselab.py
index f742750..a72d0cf 100644
--- a/recipes/firebaselab/firebaselab.py
+++ b/recipes/firebaselab/firebaselab.py
@@ -38,7 +38,6 @@
api.flutter_deps.required_deps(env, env_prefixes, deps)
task_name = api.properties.get('task_name')
- # Physical devices are treated as AND's.
physical_devices = [
# Physical devices - use only highly available devices to avoid timeouts.
# Pixel 3
@@ -51,9 +50,6 @@
# Moto Z XT1650
'--device',
'model=griffin,version=24',
- # Pixel 6.
- '--device',
- 'model=oriole,version=33',
]
virtual_devices = [
@@ -72,17 +68,10 @@
'model=Nexus6P,version=26',
'--device',
'model=Nexus6P,version=27',
- # While api 28 is not run on physical devices instead test on virtual devices.
- '--device',
- 'model=NexusLowRes,version=28',
+ # SDK 28 is run on a physical blueline/Pixel 3 above.
'--device',
'model=NexusLowRes,version=29',
- # SDK 30 is run on a physical redfin/Pixel 5 in [physical_devices].
- '--device',
- 'model=SmallPhone.arm,version=31',
- '--device',
- 'model=SmallPhone.arm,version=32',
- # SDK 33 is run on a physical oriole/Pixel 6 in [physical_devices].
+ # SDK 30 is run on a physical redfin/Pixel 5 above.
]
test_configurations = (
