[android-10]: Disable failing tests on try builder

This CL disables some failing tests on try builder
and also splits the gl_tests filter as test failing
are different for android-10

Bug: 390670398
Change-Id: I2a59517ff9f7a3328287ff0af548a9133c841397
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6394299
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Renuga Nanjappan <rnanjappan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1437958}

infra/config/generated/builders/ci/android-10-x86-rel/targets/chromium.android.json

@@ -1492,7 +1492,7 @@
           "--use-cmd-decoder=validating",
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -1964,7 +1964,7 @@
         "args": [
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
-          "--gtest_filter=-AAC/AACAudioEncoderTest.*",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.media_unittests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -3826,6 +3826,7 @@
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
           "--browser=android-chromium"
         ],
+        "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"

infra/config/generated/builders/ci/android-oreo-x86-rel/targets/chromium.android.json

@@ -1646,7 +1646,7 @@
           "--use-cmd-decoder=validating",
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/generated/builders/ci/android-pie-x86-fyi-rel/targets/chromium.android.fyi.json

@@ -1610,7 +1610,7 @@
         "args": [
           "--use-cmd-decoder=validating",
           "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/generated/builders/ci/android-pie-x86-rel/targets/chromium.android.json

@@ -1610,7 +1610,7 @@
         "args": [
           "--use-cmd-decoder=validating",
           "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/generated/builders/try/android-10-x86-rel/targets/chromium.android.json

@@ -1492,7 +1492,7 @@
           "--use-cmd-decoder=validating",
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -1964,7 +1964,7 @@
         "args": [
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
-          "--gtest_filter=-AAC/AACAudioEncoderTest.*",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.media_unittests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],
@@ -3826,6 +3826,7 @@
           "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb",
           "--browser=android-chromium"
         ],
+        "ci_only": true,
         "isolate_profile_data": true,
         "merge": {
           "script": "//testing/merge_scripts/standard_isolated_script_merge.py"

infra/config/generated/builders/try/android-oreo-x86-rel/targets/chromium.android.json

@@ -1646,7 +1646,7 @@
           "--use-cmd-decoder=validating",
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/generated/builders/try/android-pie-x86-rel/targets/chromium.android.json

@@ -1610,7 +1610,7 @@
         "args": [
           "--use-cmd-decoder=validating",
           "--avd-config=../../tools/android/avd/proto/android_28_google_apis_x86.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/generated/builders/try/android-x86-rel/targets/chromium.android.json

@@ -1646,7 +1646,7 @@
           "--use-cmd-decoder=validating",
           "--use-persistent-shell",
           "--avd-config=../../tools/android/avd/proto/generic_android26.textpb",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+          "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
           "--gs-results-bucket=chromium-result-details",
           "--recover-devices"
         ],

infra/config/subprojects/chromium/ci/chromium.android.fyi.star

@@ -399,7 +399,7 @@ ci.builder(
             ),
             "gl_tests_validating": targets.mixin(
                 args = [
-                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
                 ],
             ),
             "net_unittests": targets.mixin(

infra/config/subprojects/chromium/ci/chromium.android.star

@@ -2850,7 +2850,7 @@ ci.builder(
             # If you change this, make similar changes in android-x86-code-coverage
             "gl_tests_validating": targets.mixin(
                 args = [
-                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
                 ],
             ),
             "leveldb_unittests": targets.remove(
@@ -3317,7 +3317,7 @@ ci.builder(
             ),
             "gl_tests_validating": targets.mixin(
                 args = [
-                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
                 ],
             ),
             "net_unittests": targets.mixin(
@@ -3492,7 +3492,7 @@ ci.builder(
             ),
             "gl_tests_validating": targets.mixin(
                 args = [
-                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.gl_tests.filter",
                 ],
             ),
             "perfetto_unittests": targets.mixin(
@@ -3503,8 +3503,7 @@ ci.builder(
             ),
             "media_unittests": targets.mixin(
                 args = [
-                    # TODO(crbug.com/391490503): Disable the failing tests
-                    "--gtest_filter=-AAC/AACAudioEncoderTest.*",
+                    "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_10.media_unittests.filter",
                 ],
             ),
             "services_unittests": targets.mixin(
@@ -3524,6 +3523,7 @@ ci.builder(
                 args = [
                     "--browser=android-chromium",
                 ],
+                ci_only = True,
             ),
             "webview_instrumentation_test_apk_multiple_process_mode": targets.mixin(
                 args = [

testing/buildbot/filters/BUILD.gn

@@ -361,9 +361,10 @@ source_set("gl_tests_filters") {
 
   data = [
     "//testing/buildbot/filters/android.arm64_proguard_rel.gl_tests.filter",
+    "//testing/buildbot/filters/android.emulator_10.gl_tests.filter",
     "//testing/buildbot/filters/android.emulator_11.gl_tests.filter",
     "//testing/buildbot/filters/android.emulator_12_12l_13.gl_tests.filter",
-    "//testing/buildbot/filters/android.emulator_o_p_10.gl_tests.filter",
+    "//testing/buildbot/filters/android.emulator_o_p.gl_tests.filter",
     "//testing/buildbot/filters/android.moto_g_power_5g.gl_tests.filter",
     "//testing/buildbot/filters/android.pie_arm64_rel.gl_tests.filter",
     "//testing/buildbot/filters/android.pie_tot.gl_tests.filter",
@@ -414,6 +415,7 @@ source_set("linux_trusty_rel_browser_tests_filters") {
 source_set("media_unittests_filters") {
   data = [
     "//testing/buildbot/filters/android.emulator.media_unittests.filter",
+    "//testing/buildbot/filters/android.emulator_10.media_unittests.filter",
     "//testing/buildbot/filters/android.emulator_11.media_unittests.filter",
     "//testing/buildbot/filters/fuchsia.debug.media_unittests.filter",
     "//testing/buildbot/filters/android.device.media_unittests.filter",

testing/buildbot/filters/android.emulator_10.gl_tests.filter

@@ -0,0 +1,22 @@
+# https://crbug.com/1342710
+-CopyType/GLCopyTextureCHROMIUMES3Test.CopyTextureCubeMap/0
+-CopyType/GLCopyTextureCHROMIUMES3Test.CopyTextureLevel/0
+-CopyType/GLCopyTextureCHROMIUMES3Test.FormatCombinations*
+-CopyType/GLCopyTextureCHROMIUMTest.ImmutableTexture/0
+-CopyType/GLCopyTextureCHROMIUMTest.ImmutableTexture/1
+
+# https://crbug.com/1342713
+-GLBGRAMipMapTest.GenerateMipmapsSucceeds
+
+# https://crbug.com/1342713: GL_BGRA_EXT is broken in Android emulator.
+-GLTextureImageBackingFactory*/BGRA_8888
+
+# https://crbug.com/1189284
+-AHardwareBufferImageBackingFactoryTest.Basic/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.CanHaveMultipleReaders/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.CannotReadWhileWriting/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.CannotWriteWhileReading/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.ConcurrentReadWrite/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.InitialData/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.OnlyOneWriter/GaneshGL
+-AHardwareBufferImageBackingFactoryTest.Overlay/GaneshGL

testing/buildbot/filters/android.emulator_10.media_unittests.filter

@@ -0,0 +1,7 @@
+# https://crbug.com/1189284
+# Not applicable to emulator due to not supporting fence sync
+-PaintCanvasVideoRendererWithGLTest.CopyVideoFrameTexturesToGLTexture*
+-PaintCanvasVideoRendererWithGLTest.CopyVideoFrameYUVDataToGLTexture*
+
+# https://crbug.com/391490503
+-AAC/AACAudioEncoderTest.*