WebRTC: Add android_junit_tests.

scripts/slave/recipe_modules/webrtc/builders.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Contains the bulk of the WebRTC builder configurations so they can be reused
 # from multiple recipes.
 
 from recipe_engine.types import freeze
 
 RECIPE_CONFIGS = freeze({
@@ skipping 377 matching lines @@
         'testing': {'platform': 'linux'},
       },
       'Android32 Builder': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

Let's change the bot_type to 'builder_tester' instead (don't bother renaming the
bot, since that's a lot of extra work everywhere).

         'testing': {'platform': 'linux'},
         'triggers': [
           'Android32 Tests (L Nexus5)',
           'Android32 Tests (L Nexus7.2)',
         ],
         'archive_apprtc': True,
+        'additional_tests': {
+          'android_tests': [
+            'android_junit_tests',
+          ]
+        }
       },
       'Android32 Builder (dbg)': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

same here (builder_tester)

         'testing': {'platform': 'linux'},
         'triggers': [
           'Android32 Tests (L Nexus5)(dbg)',
           'Android32 Tests (L Nexus7.2)(dbg)',
         ],
         'archive_apprtc': True,
       },
       'Android32 Builder x86': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

same here (builder_tester)

         'testing': {'platform': 'linux'},
       },
       'Android32 Builder x86 (dbg)': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

same here (builder_tester)

         'testing': {'platform': 'linux'},
       },
       'Android32 Builder MIPS (dbg)': {
         'recipe_config': 'webrtc_android_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'mipsel',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder',
         'testing': {'platform': 'linux'},
       },
       'Android64 Builder': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

same here (builder_tester)

         'testing': {'platform': 'linux'},
         'triggers': [
           'Android64 Tests (L Nexus9)',
         ],
         'archive_apprtc': True,
       },
       'Android64 Builder (dbg)': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 64,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:24]

same here (builder_tester)

         'testing': {'platform': 'linux'},
         'archive_apprtc': True,
       },
       'Android64 Builder x64 (dbg)': {
         'recipe_config': 'webrtc_android',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'intel',
           'TARGET_BITS': 64,
         },
         'bot_type': 'builder',

[kjellander_chromium, 2016/09/23 19:24:25]

same here (builder_tester)

         'testing': {'platform': 'linux'},
       },
       'Android32 Clang (dbg)': {
         'recipe_config': 'webrtc_android_clang',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Debug',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
@@ skipping 148 matching lines @@
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
         'bot_type': 'builder_tester',
         'testing': {'platform': 'linux'},
         'use_isolate': True,
         'enable_swarming': True,
         'swarming_dimensions': {
           'os': 'Android',
           'device_type': 'bullhead', # Nexus 5X
+        },
+        'additional_tests': {
+          'android_tests': [
+            'android_junit_tests',
+          ]
         }
       },
       'Android32 ASan (L Nexus6)': {
         'recipe_config': 'webrtc_android_asan',
         'chromium_config_kwargs': {
           'BUILD_CONFIG': 'Release',
           'TARGET_PLATFORM': 'android',
           'TARGET_ARCH': 'arm',
           'TARGET_BITS': 32,
         },
@@ skipping 671 matching lines @@
         'enable_swarming': True,
         'swarming_dimensions': {
           'os': 'Android',
           'device_type': 'bullhead', # Nexus 5X
         }
       }
     },
   },
 })