commit 2f58d086785a1cb6a0c0399f16bcf95243f8ed6d
author Tong Wu <wutong@google.com> Tue Aug 27 12:27:12 2019 -0700
committer GitHub <noreply@github.com> Tue Aug 27 12:27:12 2019 -0700
tree 16a4120d4ce3c5b0b43aaa535f242479d5cdfbde
parent b38302b0c230f22347b200907381e7db15412646

Revert "Add smoke tests for Catalina/Android testing. (#39300)" (#39347)

This reverts commit b38302b0c230f22347b200907381e7db15412646.

dev/devicelab/manifest.yaml

diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index 2b07f83..2108b01 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -517,32 +517,18 @@
     stage: devicelab_ios
     required_agent_capabilities: ["mac/ios"]
 
-  smoke_catalina_start_up_ios:
-    description: >
-      A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
-    stage: devicelab_ios
-    required_agent_capabilities: ["mac-catalina/ios"]
-
-  smoke_catalina_hot_mode_dev_cycle_ios__benchmark:
-    description: >
-      A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
-    stage: devicelab_ios
-    flaky: true
-    required_agent_capabilities: ["mac-catalina/ios"]
-
   smoke_catalina_start_up:
     description: >
       A smoke test that runs on macOS Catalina, which is a clone of the Gallery startup latency test.
-    stage: devicelab
-    flaky: true
-    required_agent_capabilities: ["mac-catalina/android"]
+    stage: devicelab_ios
+    required_agent_capabilities: ["mac-catalina/ios"]
 
   smoke_catalina_hot_mode_dev_cycle__benchmark:
     description: >
       A some test that runs on macOS Catalina, which is a clone of the Dart VM hot patching performance benchmarking.
-    stage: devicelab
+    stage: devicelab_ios
     flaky: true
-    required_agent_capabilities: ["mac-catalina/android"]
+    required_agent_capabilities: ["mac-catalina/ios"]
 
   # Tests running on Windows host