android: Add test configs for android-nougat-arm64-rel

And disable the failed tests or test suites

Bug: 1095778, 1108055, 1108121, 1108124
Change-Id: Ie75c783b34765131bcd739ea12da96764ba14825
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2252599Reviewed-by: Ben Pastene <bpastene@chromium.org>
Commit-Queue: Haiyang Pan <hypan@google.com>
Cr-Commit-Position: refs/heads/master@{#791151}

testing/buildbot/mixins.pyl

@@ -636,6 +636,13 @@
     },
   },
   'nougat': {
+    'swarming': {
+      'dimensions': {
+        'device_os': 'NJH47F',
+      },
+    },
+  },
+  'nougat_generic': {
     'swarming': {
       'dimensions': {
         'device_os': 'N',
@@ -685,6 +692,15 @@
       },
     },
   },
+  'sailfish': {
+    # Pixel 1
+    'swarming': {
+      'dimensions': {
+        'device_type': 'sailfish',
+        'os': 'Android',
+      },
+    },
+  },
   'shamu': {
     # Nexus 6
     'swarming': {

testing/buildbot/test_suite_exceptions.pyl

@@ -90,6 +90,16 @@
       'Linux FYI GPU TSAN Release',
     ],
   },
+  'blink_platform_unittests': {
+    'modifications': {
+      # TODO(crbug.com/1108121): Remove this filter
+      'android-nougat-arm64-rel': {
+        'args': [
+          '--gtest_filter=-HarfBuzzShaperTest.ShapeHorizontalWithoutSubpixelPositionWithKerningIsRounded',
+        ],
+      },
+    },
+  },
   'blink_web_tests': {
     'remove_from': [
       'Win 7 Tests x64 (1)',  # 64-bit win is unsupported by the layout tests.
@@ -743,6 +753,14 @@
       'android-asan',  # https://crbug.com/964562
       'android-code-coverage-native', # https://crbug.com/1018780
     ],
+    'modifications': {
+      # Use "--replace-system-package" according to crbug.com/931947#c1
+      'android-nougat-arm64-rel': {
+        'args': [
+          '--replace-system-package=com.google.vr.vrcore,//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk'
+        ]
+      }
+    },
   },
   'chrome_public_test_vr_apk-vega': {
     'modifications': {
@@ -896,6 +914,15 @@
           '-v', # TODO(crbug.com/1093602) Remove once the issue is resolved
         ],
       },
+      'android-nougat-arm64-rel': {
+        'swarming': {
+          'shards': 16,
+        },
+        # TODO(crbug.com/1108055): Remove this filter
+        'args': [
+          '--gtest_filter=-BackgroundTracingManagerBrowserTest.PerfettoSystemBackgroundScenario*',
+        ],
+      },
       'android-pie-x86-rel': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
@@ -1561,6 +1588,13 @@
           '--replace-system-package=com.google.ar.core,//third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk'
         ]
       },
+      'android-nougat-arm64-rel': {
+        'args': [
+          # ArCore is not installed as a system app on N, so we can install it
+          # normally instead of replacing the system version.
+          '--additional-apk=//third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk'
+        ],
+      },
       'android-pie-arm64-dbg': {
         'args': [
           '--replace-system-package=com.google.ar.core,//third_party/arcore-android-sdk/test-apks/arcore/arcore_current.apk'
@@ -1801,6 +1835,7 @@
       # Don't run on trybots; waterfall is enough.
       'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
+      'android-nougat-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
       'Lollipop Tablet Tester',
@@ -1848,6 +1883,7 @@
       # Don't run on trybots; waterfall is enough.
       'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
+      'android-nougat-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
       'Lollipop Tablet Tester',
@@ -1861,6 +1897,7 @@
       # Don't run on trybots; waterfall is enough.
       'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
+      'android-nougat-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
       'Lollipop Tablet Tester',
@@ -1878,6 +1915,12 @@
           'shards': 10,
         },
       },
+      'android-nougat-arm64-rel': {
+        # TODO(crbug.com/1108055): Remove this filter
+        'args': [
+          '--gtest_filter=-BackgroundTracingManagerBrowserTest.PerfettoSystemBackgroundScenario*',
+        ],
+      },
       'android-pie-x86-rel': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator_p.content_browsertests.filter',
@@ -1894,6 +1937,7 @@
       # Don't run on trybots; waterfall is enough.
       'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
+      'android-nougat-arm64-rel',
       'android-pie-arm64-rel',
       # No capacity for tablet testers.
       'Lollipop Tablet Tester',
@@ -1993,6 +2037,7 @@
   },
   'perfetto_unittests': {
     'remove_from': [
+      # TODO(crbug.com/931138): Fix permission issue when creating tmp files
       'android-arm64-proguard-rel',
       'android-asan',
       'android-code-coverage',
@@ -2000,6 +2045,7 @@
       'android-lollipop-arm-rel',
       'android-marshmallow-arm64-rel',
       'android-marshmallow-x86-rel',
+      'android-nougat-arm64-rel',
       'android-pie-arm64-rel',
       'android-pie-x86-rel',
       'Android CFI',
@@ -2180,6 +2226,14 @@
         },
       },
     },
+    'modifications': {
+      'android-nougat-arm64-rel': {
+        # TODO(crbug.com/1108055): Remove this filter
+        'args': [
+          '--gtest_filter=-SystemPerfettoTest.*',
+        ],
+      }
+    }
   },
   'skia_renderer_gl_blink_web_tests': {
     'modifications': {
@@ -2353,6 +2407,7 @@
       # There's no need to run telemetry_perf_unittests on both lollipop and
       # marshmallow on the CQ. https://crbug.com/1026487.
       'android-marshmallow-arm64-rel',
+      'android-nougat-arm64-rel', # crbug.com/1108124
       'android-pie-arm64-rel',
       # crbug.com/936540
       'Mac10.10 Tests',

testing/buildbot/test_suites.pyl

@@ -4728,6 +4728,23 @@
       'android_smoke_tests',
     ],
 
+    # TODO(crbug/1095778): Split the test suites to run on sailfish and marlin
+    # when both of device types are online
+    'android_nougat_rel_gtests': [
+      'android_monochrome_smoke_tests',
+      'android_pagecontroller_self_tests',
+      'android_smoke_tests',
+      'android_specific_chromium_gtests',  # Already includes gl_gtests.
+      'chromium_gtests',
+      'chromium_gtests_for_devices_with_graphical_output',
+      'linux_flavor_specific_chromium_gtests',
+      'network_service_android_gtests',
+      'system_webview_shell_instrumentation_tests', # Not an experimental test
+      'vr_platform_specific_chromium_gtests',
+      'weblayer_android_gtests',
+      'weblayer_gtests',
+    ],
+
     'android_oreo_gtests': [
       'android_ar_gtests',
       'android_ddready_vr_gtests',
@@ -5595,17 +5612,17 @@
       'skia_renderer_fyi_gtests',
     ],
 
-    'marshmallow_pie_isolated_scripts': [
+    'marshmallow_nougat_pie_isolated_scripts_with_proguard': [
       'android_isolated_scripts',
       'components_perftests_isolated_scripts',
+      'monochrome_apk_checker_isolated_script',
       'telemetry_android_minidump_unittests_isolated_scripts',
       'telemetry_perf_unittests_isolated_scripts',
     ],
 
-    'marshmallow_pie_isolated_scripts_with_proguard': [
+    'marshmallow_pie_isolated_scripts': [
       'android_isolated_scripts',
       'components_perftests_isolated_scripts',
-      'monochrome_apk_checker_isolated_script',
       'telemetry_android_minidump_unittests_isolated_scripts',
       'telemetry_perf_unittests_isolated_scripts',
     ],

testing/buildbot/waterfalls.pyl

@@ -705,9 +705,24 @@
         'os_type': 'android',
         'test_suites': {
           'gtest_tests': 'android_lollipop_marshmallow_gtests',
-          'isolated_scripts': 'marshmallow_pie_isolated_scripts_with_proguard',
+          'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
         }
       },
+      'android-nougat-arm64-rel': {
+        'mixins': [
+          'nougat',
+          'sailfish',
+        ],
+        'additional_compile_targets': [
+          'monochrome_static_initializers',
+          'weblayer_shell',
+        ],
+        'test_suites': {
+          'gtest_tests': 'android_nougat_rel_gtests',
+          'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
+        },
+        'os_type': 'android',
+      },
       'android-pie-arm64-dbg': {
         'mixins': [
           'pie_fleet',
@@ -730,7 +745,7 @@
         ],
         'test_suites': {
           'gtest_tests': 'android_pie_rel_non_skia_renderer_gtests',
-          'isolated_scripts': 'marshmallow_pie_isolated_scripts_with_proguard',
+          'isolated_scripts': 'marshmallow_nougat_pie_isolated_scripts_with_proguard',
         },
         'use_swarming': True,
         'os_type': 'android',
@@ -3139,7 +3154,7 @@
         'mixins': [
           'foster',
           'gpu_pool',
-          'nougat',
+          'nougat_generic',
         ],
         'test_suites': {
           'gtest_tests': 'gpu_fyi_android_gtests',