From ceef32886fc672be56003d28db8ccd2cdda60949 Mon Sep 17 00:00:00 2001
From: godofredoc <54371434+godofredoc@users.noreply.github.com>
Date: Mon, 1 Mar 2021 10:46:03 -0800
Subject: [PATCH] Move flaky flag  from the remainin mac/ios tests. (#76960)

Bug: https://github.com/flutter/flutter/issues/73392
---
 dev/devicelab/manifest.yaml | 45 -------------------------------------
 dev/prod_builders.json      | 20 +++++++++++++----
 2 files changed, 16 insertions(+), 49 deletions(-)

diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index eaa3eeb4f7..07cda25bc5 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -63,28 +63,6 @@ tasks:
     stage: devicelab_win
     required_agent_capabilities: ["windows/android"]
 
-  # iOS on-device tests
-
-  native_ui_tests_ios32:
-    description: >
-      Run native XCUITests on 32-bit iOS (iPhone 4S).
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios32"]
-    flaky: true
-
-  flutter_gallery_ios__start_up:
-    description: >
-      Measures the startup time of the Flutter Gallery app on iPhone 6.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios"]
-
-  flutter_gallery_ios__transition_perf:
-    description: >
-      Measures the performance of screen transitions in Flutter Gallery on
-      iOS.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios"]
-
   # Tests running on Windows host
 
   flavors_test_win:
@@ -104,26 +82,3 @@ tasks:
       Measures the performance of Dart VM hot patching feature on Windows.
     stage: devicelab_win
     required_agent_capabilities: ["windows/android"]
-
-  # Tests running on Linux hosts
-
-  flutter_gallery__transition_perf_e2e_ios32:
-    description: >
-      Measures the performance of screen transitions in Flutter Gallery on
-      Android with e2e.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios32"]
-    flaky: true
-
-  flutter_gallery__transition_perf_e2e_ios:
-    description: >
-      Measures the performance of screen transitions in Flutter Gallery on
-      Android with e2e.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios"]
-
-  new_gallery_ios__transition_perf:
-    description: >
-      Measures the performance of screen transitions in the new Flutter Gallery on iOS.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac/ios"]
diff --git a/dev/prod_builders.json b/dev/prod_builders.json
index 2d1358d7d9..de37e7941e 100644
--- a/dev/prod_builders.json
+++ b/dev/prod_builders.json
@@ -850,6 +850,12 @@
       "name": "Mac_ios flutter_gallery__transition_perf_e2e_ios",
       "repo": "flutter",
       "task_name": "mac_ios_flutter_gallery__transition_perf_e2e_ios",
+      "flaky": false
+    },
+    {
+      "name": "Mac_ios flutter_gallery__transition_perf_e2e_ios32",
+      "repo": "flutter",
+      "task_name": "mac_ios_flutter_gallery__transition_perf_e2e_ios32",
       "flaky": true
     },
     {
@@ -862,13 +868,13 @@
       "name": "Mac_ios flutter_gallery_ios__start_up",
       "repo": "flutter",
       "task_name": "mac_ios_flutter_gallery_ios__start_up",
-      "flaky": true
+      "flaky": false
     },
     {
       "name": "Mac_ios flutter_gallery_ios__transition_perf",
       "repo": "flutter",
       "task_name": "mac_ios_flutter_gallery_ios__transition_perf",
-      "flaky": true
+      "flaky": false
     },
     {
       "name": "Mac_ios flutter_view_ios__start_up",
@@ -954,11 +960,17 @@
       "task_name": "mac_ios_microbenchmarks_ios",
       "flaky": false
     },
+    {
+      "name": "Mac_ios native_ui_tests_ios32",
+      "repo": "flutter",
+      "task_name": "mac_ios_native_ui_tests_ios32",
+      "flaky": true
+    },
     {
       "name": "Mac_ios new_gallery_ios__transition_perf",
       "repo": "flutter",
       "task_name": "mac_ios_new_gallery_ios__transition_perf",
-      "flaky": true
+      "flaky": false
     },
     {
       "name": "Mac_ios platform_channel_sample_test_ios",
@@ -1006,7 +1018,7 @@
       "name": "Mac_ios smoke_catalina_hot_mode_dev_cycle_ios__benchmark",
       "repo": "flutter",
       "task_name": "mac_ios_smoke_catalina_hot_mode_dev_cycle_ios__benchmark",
-      "flaky": true
+      "flaky": false
     },
     {
       "name": "Mac_ios tiles_scroll_perf_ios__timeline_summary",