Merge "Exclude flaky from internal/infra/TEST_MAPPING" into main

2023-07-28 23:35:08 +00:00
parent 7be9cb37f7 1940a1f157
commit ec3aa028cd
1 changed files with 12 additions and 4 deletions
--- a/core/java/com/android/internal/infra/TEST_MAPPING
+++ b/core/java/com/android/internal/infra/TEST_MAPPING
@@ -1,14 +1,22 @@
 {
  "presubmit": [
    {
-      "name": "CtsRoleTestCases"
+      "name": "CtsRoleTestCases",
+      "options": [
+          {
+              "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+          }
+      ]
    },
    {
      "name": "CtsPermissionTestCases",
      "options": [
-        {
-          "include-filter": "android.permission.cts.PermissionControllerTest"
-        }
+          {
+            "include-filter": "android.permission.cts.PermissionControllerTest"
+          },
+          {
+            "exclude-annotation": "android.platform.test.annotations.FlakyTest"
+          }
      ]
    },
    {