Move FrameworksServicesTests to group presubmit-large

easoncylee · Chun-Yi Lee · commit f994d1229b81 · 2021-04-19T13:32:12.000Z
The test config takes longer than 15mins to run. Move it to a dedicated
group for running slow presubmit Test Mapping test.

Some more context is in the referenced bug, e.g, b/174495337
The group will work exactly the same as presubmit for now.

Bug: 174654670
Bug: 174495337
Test: none
Change-Id: Ifefd791b8dc24d5fda12affac0c99787da3d5086
diff --git a/TEST_MAPPING b/TEST_MAPPING
@@ -1,45 +1,47 @@
 {
-  "presubmit": [
+  "presubmit-large": [
     {
-      "name": "FrameworksUiServicesTests",
+      "name": "FrameworksServicesTests",
       "options": [
+        {
+          "include-annotation": "android.platform.test.annotations.Presubmit"
+        },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
+        },
+        {
+          "exclude-annotation": "org.junit.Ignore"
         }
       ]
-    },
+    }
+  ],
+  "presubmit": [
     {
-      "name": "ExtServicesUnitTests",
+      "name": "FrameworksUiServicesTests",
       "options": [
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     },
     {
-      "name": "TestablesTests",
+      "name": "ExtServicesUnitTests",
       "options": [
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
         }
       ]
     },
     {
-      "name": "FrameworksCoreTests",
+      "name": "TestablesTests",
       "options": [
-        {
-          "include-annotation": "android.platform.test.annotations.Presubmit"
-        },
         {
           "exclude-annotation": "androidx.test.filters.FlakyTest"
-        },
-        {
-          "exclude-annotation": "org.junit.Ignore"
         }
       ]
     },
     {
-      "name": "FrameworkPermissionTests",
+      "name": "FrameworksCoreTests",
       "options": [
         {
           "include-annotation": "android.platform.test.annotations.Presubmit"
@@ -53,7 +55,7 @@
       ]
     },
     {
-      "name": "FrameworksServicesTests",
+      "name": "FrameworkPermissionTests",
       "options": [
         {
           "include-annotation": "android.platform.test.annotations.Presubmit"

Original file line number	Diff line number	Diff line change
`@@ -1,45 +1,47 @@`
`1`	`1`	`{`
`2`		`- "presubmit": [`
	`2`	`+ "presubmit-large": [`
`3`	`3`	`{`
`4`		`- "name": "FrameworksUiServicesTests",`
	`4`	`+ "name": "FrameworksServicesTests",`
`5`	`5`	`"options": [`
	`6`	`+ {`
	`7`	`+ "include-annotation": "android.platform.test.annotations.Presubmit"`
	`8`	`+ },`
`6`	`9`	`{`
`7`	`10`	`"exclude-annotation": "androidx.test.filters.FlakyTest"`
	`11`	`+ },`
	`12`	`+ {`
	`13`	`+ "exclude-annotation": "org.junit.Ignore"`
`8`	`14`	`}`
`9`	`15`	`]`
`10`		`- },`
	`16`	`+ }`
	`17`	`+ ],`
	`18`	`+ "presubmit": [`
`11`	`19`	`{`
`12`		`- "name": "ExtServicesUnitTests",`
	`20`	`+ "name": "FrameworksUiServicesTests",`
`13`	`21`	`"options": [`
`14`	`22`	`{`
`15`	`23`	`"exclude-annotation": "androidx.test.filters.FlakyTest"`
`16`	`24`	`}`
`17`	`25`	`]`
`18`	`26`	`},`
`19`	`27`	`{`
`20`		`- "name": "TestablesTests",`
	`28`	`+ "name": "ExtServicesUnitTests",`
`21`	`29`	`"options": [`
`22`	`30`	`{`
`23`	`31`	`"exclude-annotation": "androidx.test.filters.FlakyTest"`
`24`	`32`	`}`
`25`	`33`	`]`
`26`	`34`	`},`
`27`	`35`	`{`
`28`		`- "name": "FrameworksCoreTests",`
	`36`	`+ "name": "TestablesTests",`
`29`	`37`	`"options": [`
`30`		`- {`
`31`		`- "include-annotation": "android.platform.test.annotations.Presubmit"`
`32`		`- },`
`33`	`38`	`{`
`34`	`39`	`"exclude-annotation": "androidx.test.filters.FlakyTest"`
`35`		`- },`
`36`		`- {`
`37`		`- "exclude-annotation": "org.junit.Ignore"`
`38`	`40`	`}`
`39`	`41`	`]`
`40`	`42`	`},`
`41`	`43`	`{`
`42`		`- "name": "FrameworkPermissionTests",`
	`44`	`+ "name": "FrameworksCoreTests",`
`43`	`45`	`"options": [`
`44`	`46`	`{`
`45`	`47`	`"include-annotation": "android.platform.test.annotations.Presubmit"`
`@@ -53,7 +55,7 @@`
`53`	`55`	`]`
`54`	`56`	`},`
`55`	`57`	`{`
`56`		`- "name": "FrameworksServicesTests",`
	`58`	`+ "name": "FrameworkPermissionTests",`
`57`	`59`	`"options": [`
`58`	`60`	`{`
`59`	`61`	`"include-annotation": "android.platform.test.annotations.Presubmit"`