Use Pixel 5 in FTL
Pixel 4 is deprecated and leading to timeouts.
Change-Id: I088d6c299ae2f828285f13677c3f023203dd5d4f
Reviewed-on: https://flutter-review.googlesource.com/c/recipes/+/19280
Reviewed-by: Godofredo Contreras <godofredoc@google.com>
Commit-Queue: Godofredo Contreras <godofredoc@google.com>
diff --git a/recipes/firebaselab/firebaselab.expected/basic.json b/recipes/firebaselab/firebaselab.expected/basic.json
index a1e5877..f7b96de 100644
--- a/recipes/firebaselab/firebaselab.expected/basic.json
+++ b/recipes/firebaselab/firebaselab.expected/basic.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -468,7 +468,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "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 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 10.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab.expected/failure 15.json b/recipes/firebaselab/firebaselab.expected/failure 15.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab.expected/failure 15.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "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 79f7cb7..47d1a88 100644
--- a/recipes/firebaselab/firebaselab.py
+++ b/recipes/firebaselab/firebaselab.py
@@ -43,9 +43,9 @@
# Pixel 3
'--device',
'model=blueline,version=28',
- # Pixel 4
+ # Pixel 5
'--device',
- 'model=flame,version=29',
+ 'model=redfin,version=30',
# Moto Z XT1650
'--device',
'model=griffin,version=24',
@@ -70,9 +70,9 @@
'--device',
'model=Nexus6P,version=27',
# SDK 28 is run on a physical blueline/Pixel 3 above.
- # SDK 29 is run on a physical flame/Pixel 4 above.
'--device',
- 'model=NexusLowRes,version=30',
+ 'model=NexusLowRes,version=29',
+ # SDK 30 is run on a physical redfin/Pixel 5 above.
]
test_configurations = (
diff --git a/recipes/firebaselab/firebaselab_2_5_0.expected/basic.json b/recipes/firebaselab/firebaselab_2_5_0.expected/basic.json
index a1e5877..f7b96de 100644
--- a/recipes/firebaselab/firebaselab_2_5_0.expected/basic.json
+++ b/recipes/firebaselab/firebaselab_2_5_0.expected/basic.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -468,7 +468,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_5_0.expected/failure 10.json b/recipes/firebaselab/firebaselab_2_5_0.expected/failure 10.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_5_0.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab_2_5_0.expected/failure 10.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_5_0.expected/failure 15.json b/recipes/firebaselab/firebaselab_2_5_0.expected/failure 15.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_5_0.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab_2_5_0.expected/failure 15.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_5_0.py b/recipes/firebaselab/firebaselab_2_5_0.py
index 79f7cb7..47d1a88 100644
--- a/recipes/firebaselab/firebaselab_2_5_0.py
+++ b/recipes/firebaselab/firebaselab_2_5_0.py
@@ -43,9 +43,9 @@
# Pixel 3
'--device',
'model=blueline,version=28',
- # Pixel 4
+ # Pixel 5
'--device',
- 'model=flame,version=29',
+ 'model=redfin,version=30',
# Moto Z XT1650
'--device',
'model=griffin,version=24',
@@ -70,9 +70,9 @@
'--device',
'model=Nexus6P,version=27',
# SDK 28 is run on a physical blueline/Pixel 3 above.
- # SDK 29 is run on a physical flame/Pixel 4 above.
'--device',
- 'model=NexusLowRes,version=30',
+ 'model=NexusLowRes,version=29',
+ # SDK 30 is run on a physical redfin/Pixel 5 above.
]
test_configurations = (
diff --git a/recipes/firebaselab/firebaselab_2_6_0.expected/basic.json b/recipes/firebaselab/firebaselab_2_6_0.expected/basic.json
index a1e5877..f7b96de 100644
--- a/recipes/firebaselab/firebaselab_2_6_0.expected/basic.json
+++ b/recipes/firebaselab/firebaselab_2_6_0.expected/basic.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -468,7 +468,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_6_0.expected/failure 10.json b/recipes/firebaselab/firebaselab_2_6_0.expected/failure 10.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_6_0.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab_2_6_0.expected/failure 10.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_6_0.expected/failure 15.json b/recipes/firebaselab/firebaselab_2_6_0.expected/failure 15.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_6_0.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab_2_6_0.expected/failure 15.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_6_0.py b/recipes/firebaselab/firebaselab_2_6_0.py
index 79f7cb7..47d1a88 100644
--- a/recipes/firebaselab/firebaselab_2_6_0.py
+++ b/recipes/firebaselab/firebaselab_2_6_0.py
@@ -43,9 +43,9 @@
# Pixel 3
'--device',
'model=blueline,version=28',
- # Pixel 4
+ # Pixel 5
'--device',
- 'model=flame,version=29',
+ 'model=redfin,version=30',
# Moto Z XT1650
'--device',
'model=griffin,version=24',
@@ -70,9 +70,9 @@
'--device',
'model=Nexus6P,version=27',
# SDK 28 is run on a physical blueline/Pixel 3 above.
- # SDK 29 is run on a physical flame/Pixel 4 above.
'--device',
- 'model=NexusLowRes,version=30',
+ 'model=NexusLowRes,version=29',
+ # SDK 30 is run on a physical redfin/Pixel 5 above.
]
test_configurations = (
diff --git a/recipes/firebaselab/firebaselab_2_7_0.expected/basic.json b/recipes/firebaselab/firebaselab_2_7_0.expected/basic.json
index a1e5877..f7b96de 100644
--- a/recipes/firebaselab/firebaselab_2_7_0.expected/basic.json
+++ b/recipes/firebaselab/firebaselab_2_7_0.expected/basic.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -468,7 +468,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests/the_task",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_7_0.expected/failure 10.json b/recipes/firebaselab/firebaselab_2_7_0.expected/failure 10.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_7_0.expected/failure 10.json
+++ b/recipes/firebaselab/firebaselab_2_7_0.expected/failure 10.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_7_0.expected/failure 15.json b/recipes/firebaselab/firebaselab_2_7_0.expected/failure 15.json
index 68f4392..b067678 100644
--- a/recipes/firebaselab/firebaselab_2_7_0.expected/failure 15.json
+++ b/recipes/firebaselab/firebaselab_2_7_0.expected/failure 15.json
@@ -381,7 +381,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -427,7 +427,7 @@
"--device",
"model=blueline,version=28",
"--device",
- "model=flame,version=29",
+ "model=redfin,version=30",
"--device",
"model=griffin,version=24"
],
@@ -514,7 +514,7 @@
"--device",
"model=Nexus6P,version=27",
"--device",
- "model=NexusLowRes,version=30"
+ "model=NexusLowRes,version=29"
],
"cwd": "[START_DIR]/flutter/dev/integration_tests",
"env": {
diff --git a/recipes/firebaselab/firebaselab_2_7_0.py b/recipes/firebaselab/firebaselab_2_7_0.py
index 79f7cb7..47d1a88 100644
--- a/recipes/firebaselab/firebaselab_2_7_0.py
+++ b/recipes/firebaselab/firebaselab_2_7_0.py
@@ -43,9 +43,9 @@
# Pixel 3
'--device',
'model=blueline,version=28',
- # Pixel 4
+ # Pixel 5
'--device',
- 'model=flame,version=29',
+ 'model=redfin,version=30',
# Moto Z XT1650
'--device',
'model=griffin,version=24',
@@ -70,9 +70,9 @@
'--device',
'model=Nexus6P,version=27',
# SDK 28 is run on a physical blueline/Pixel 3 above.
- # SDK 29 is run on a physical flame/Pixel 4 above.
'--device',
- 'model=NexusLowRes,version=30',
+ 'model=NexusLowRes,version=29',
+ # SDK 30 is run on a physical redfin/Pixel 5 above.
]
test_configurations = (
