| Index: scripts/slave/recipe_modules/webrtc/builders.py
|
| diff --git a/scripts/slave/recipe_modules/webrtc/builders.py b/scripts/slave/recipe_modules/webrtc/builders.py
|
| index 0c0fcbf846aa75eb353ce27f1bb4de03a90fe1f8..d0b7b992cfe4a8598a3d37db320825ca3e255e79 100644
|
| --- a/scripts/slave/recipe_modules/webrtc/builders.py
|
| +++ b/scripts/slave/recipe_modules/webrtc/builders.py
|
| @@ -394,42 +394,6 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android32 Builder': {
|
| - 'recipe_config': 'webrtc_android_swarming',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'linux'},
|
| - 'triggers': [
|
| - 'Android32 Tests (L Nexus5)',
|
| - 'Android32 Tests (L Nexus7.2)',
|
| - 'Android32 Tests (M Nexus5X)',
|
| - ],
|
| - 'archive_apprtc': True,
|
| - 'use_isolate': True,
|
| - },
|
| - 'Android32 Builder (dbg)': {
|
| - 'recipe_config': 'webrtc_android_swarming',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'linux'},
|
| - 'triggers': [
|
| - 'Android32 Tests (L Nexus5)(dbg)',
|
| - 'Android32 Tests (L Nexus7.2)(dbg)',
|
| - 'Android32 Tests (M Nexus5X)(dbg)',
|
| - ],
|
| - 'archive_apprtc': True,
|
| - 'use_isolate': True,
|
| - },
|
| 'Android32 Builder x86': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| @@ -463,39 +427,6 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android64 Builder': {
|
| - 'recipe_config': 'webrtc_android_swarming',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 64,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'linux'},
|
| - 'triggers': [
|
| - 'Android64 Tests (M Nexus5X)',
|
| - 'Android64 Tests (L Nexus9)',
|
| - ],
|
| - 'archive_apprtc': True,
|
| - 'use_isolate': True,
|
| - },
|
| - 'Android64 Builder (dbg)': {
|
| - 'recipe_config': 'webrtc_android_swarming',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 64,
|
| - },
|
| - 'bot_type': 'builder',
|
| - 'testing': {'platform': 'linux'},
|
| - 'triggers': [
|
| - 'Android64 Tests (M Nexus5X)(dbg)',
|
| - ],
|
| - 'archive_apprtc': True,
|
| - 'use_isolate': True,
|
| - },
|
| 'Android64 Builder x64 (dbg)': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
| @@ -540,61 +471,7 @@ BUILDERS = freeze({
|
| 'bot_type': 'builder',
|
| 'testing': {'platform': 'linux'},
|
| },
|
| - 'Android32 Tests (L Nexus5)(dbg)': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder (dbg)',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| - 'Android32 Tests (L Nexus5)': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'webrtc_config_kwargs': {
|
| - 'PERF_ID': 'webrtc-android-tests-nexus5',
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| - 'Android32 Tests (L Nexus7.2)(dbg)': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder (dbg)',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| - 'Android32 Tests (L Nexus7.2)': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'webrtc_config_kwargs': {
|
| - 'PERF_ID': 'webrtc-android-tests-nexus72',
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder Release',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| - 'Android32 Tests (M Nexus5X)(dbg)': {
|
| + 'Android32 (M Nexus5X)(dbg)': {
|
| 'recipe_config': 'webrtc_android_swarming',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| @@ -602,9 +479,9 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder (dbg)',
|
| + 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| + 'archive_apprtc': True,
|
| 'enable_swarming': True,
|
| 'use_isolate': True,
|
| 'swarming_dimensions': {
|
| @@ -613,7 +490,7 @@ BUILDERS = freeze({
|
| 'os': 'Android',
|
| }
|
| },
|
| - 'Android32 Tests (M Nexus5X)': {
|
| + 'Android32 (M Nexus5X)': {
|
| 'recipe_config': 'webrtc_android_swarming',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -621,9 +498,9 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 32,
|
| },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android32 Builder',
|
| + 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| + 'archive_apprtc': True,
|
| 'enable_swarming': True,
|
| 'use_isolate': True,
|
| 'swarming_dimensions': {
|
| @@ -632,22 +509,7 @@ BUILDERS = freeze({
|
| 'os': 'Android',
|
| }
|
| },
|
| - 'Android64 Tests (L Nexus9)': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Release',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 64,
|
| - },
|
| - 'webrtc_config_kwargs': {
|
| - 'PERF_ID': 'webrtc-android-tests-nexus9',
|
| - },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android64 Builder',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| - 'Android64 Tests (M Nexus5X)(dbg)': {
|
| + 'Android64 (M Nexus5X)(dbg)': {
|
| 'recipe_config': 'webrtc_android_swarming',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Debug',
|
| @@ -655,9 +517,9 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android64 Builder (dbg)',
|
| + 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| + 'archive_apprtc': True,
|
| 'enable_swarming': True,
|
| 'use_isolate': True,
|
| 'swarming_dimensions': {
|
| @@ -666,7 +528,7 @@ BUILDERS = freeze({
|
| 'os': 'Android',
|
| }
|
| },
|
| - 'Android64 Tests (M Nexus5X)': {
|
| + 'Android64 (M Nexus5X)': {
|
| 'recipe_config': 'webrtc_android_swarming',
|
| 'chromium_config_kwargs': {
|
| 'BUILD_CONFIG': 'Release',
|
| @@ -674,9 +536,9 @@ BUILDERS = freeze({
|
| 'TARGET_ARCH': 'arm',
|
| 'TARGET_BITS': 64,
|
| },
|
| - 'bot_type': 'tester',
|
| - 'parent_buildername': 'Android64 Builder',
|
| + 'bot_type': 'builder_tester',
|
| 'testing': {'platform': 'linux'},
|
| + 'archive_apprtc': True,
|
| 'enable_swarming': True,
|
| 'use_isolate': True,
|
| 'swarming_dimensions': {
|
| @@ -825,6 +687,87 @@ BUILDERS = freeze({
|
| },
|
| },
|
| },
|
| + 'client.webrtc.perf': {
|
| + 'settings': {
|
| + 'build_gs_bucket': 'chromium-webrtc',
|
| + },
|
| + 'builders': {
|
| + 'Android32 Builder': {
|
| + 'recipe_config': 'webrtc_android',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_PLATFORM': 'android',
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_BITS': 32,
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'linux'},
|
| + 'triggers': [
|
| + 'Android32 Tests (L Nexus5)',
|
| + 'Android32 Tests (L Nexus7.2)',
|
| + ],
|
| + },
|
| + 'Android64 Builder': {
|
| + 'recipe_config': 'webrtc_android',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_PLATFORM': 'android',
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_BITS': 64,
|
| + },
|
| + 'bot_type': 'builder',
|
| + 'testing': {'platform': 'linux'},
|
| + 'triggers': [
|
| + 'Android64 Tests (L Nexus9)',
|
| + ],
|
| + },
|
| + 'Android32 Tests (L Nexus5)': {
|
| + 'recipe_config': 'webrtc_android',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_PLATFORM': 'android',
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_BITS': 32,
|
| + },
|
| + 'webrtc_config_kwargs': {
|
| + 'PERF_ID': 'webrtc-android-tests-nexus5',
|
| + },
|
| + 'bot_type': 'tester',
|
| + 'parent_buildername': 'Android32 Builder',
|
| + 'testing': {'platform': 'linux'},
|
| + },
|
| + 'Android32 Tests (L Nexus7.2)': {
|
| + 'recipe_config': 'webrtc_android',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_PLATFORM': 'android',
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_BITS': 32,
|
| + },
|
| + 'webrtc_config_kwargs': {
|
| + 'PERF_ID': 'webrtc-android-tests-nexus72',
|
| + },
|
| + 'bot_type': 'tester',
|
| + 'parent_buildername': 'Android32 Builder Release',
|
| + 'testing': {'platform': 'linux'},
|
| + },
|
| + 'Android64 Tests (L Nexus9)': {
|
| + 'recipe_config': 'webrtc_android',
|
| + 'chromium_config_kwargs': {
|
| + 'BUILD_CONFIG': 'Release',
|
| + 'TARGET_PLATFORM': 'android',
|
| + 'TARGET_ARCH': 'arm',
|
| + 'TARGET_BITS': 64,
|
| + },
|
| + 'webrtc_config_kwargs': {
|
| + 'PERF_ID': 'webrtc-android-tests-nexus9',
|
| + },
|
| + 'bot_type': 'tester',
|
| + 'parent_buildername': 'Android64 Builder',
|
| + 'testing': {'platform': 'linux'},
|
| + },
|
| + },
|
| + },
|
| 'tryserver.webrtc': {
|
| 'settings': {
|
| 'build_gs_bucket': 'chromium-webrtc',
|
| @@ -1407,17 +1350,6 @@ BUILDERS = freeze({
|
| 'os': 'Android',
|
| }
|
| },
|
| - 'android_n6': {
|
| - 'recipe_config': 'webrtc_android',
|
| - 'chromium_config_kwargs': {
|
| - 'BUILD_CONFIG': 'Debug',
|
| - 'TARGET_PLATFORM': 'android',
|
| - 'TARGET_ARCH': 'arm',
|
| - 'TARGET_BITS': 32,
|
| - },
|
| - 'bot_type': 'builder_tester',
|
| - 'testing': {'platform': 'linux'},
|
| - },
|
| 'android_gyp_dbg': {
|
| 'recipe_config': 'webrtc_android',
|
| 'chromium_config_kwargs': {
|
|
|