Index: scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py |
diff --git a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py b/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py |
similarity index 55% |
copy from scripts/slave/recipe_modules/chromium_tests/chromium_mac.py |
copy to scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py |
index 56d6541bb91cc224cc1477e86f8a0a98eed8b987..573691ed19b587384bee7b5c15ca6ff07a7586e7 100644 |
--- a/scripts/slave/recipe_modules/chromium_tests/chromium_mac.py |
+++ b/scripts/slave/recipe_modules/chromium_tests/chromium_gpu_fyi.py |
@@ -1,4 +1,4 @@ |
-# Copyright 2014 The Chromium Authors. All rights reserved. |
+# Copyright 2015 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. |
@@ -6,16 +6,17 @@ from . import steps |
SPEC = { |
'settings': { |
- 'build_gs_bucket': 'chromium-mac-archive', |
+ 'build_gs_bucket': 'chromium-gpu-fyi-archive', |
# WARNING: src-side runtest.py is only tested with chromium CQ builders. |
# Usage not covered by chromium CQ is not supported and can break |
# without notice. |
'src_side_runtest_py': True, |
}, |
'builders': { |
- 'Mac Builder': { |
+ 'GPU NextGen Linux Builder': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop', |
+ 'archive_gpu_tests', 'chrome_with_codecs'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Release', |
@@ -23,142 +24,93 @@ SPEC = { |
}, |
'bot_type': 'builder', |
'compile_targets': [ |
- 'chromium_builder_tests', |
], |
'testing': { |
- 'platform': 'mac', |
+ 'platform': 'linux', |
}, |
- 'enable_swarming': True, |
'use_isolate': True, |
- }, |
- 'Mac10.6 Tests': { |
- 'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
- 'gclient_config': 'chromium', |
- 'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Release', |
- 'TARGET_BITS': 64, |
- }, |
- 'test_generators': [ |
- steps.generate_gtest, |
- steps.generate_script, |
- steps.generate_isolated_script, |
- ], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder', |
- 'testing': { |
- 'platform': 'mac', |
- }, |
'enable_swarming': True, |
- 'swarming_dimensions': { |
- 'os': 'Mac-10.6', |
- }, |
}, |
- 'Mac10.8 Tests': { |
+ 'GPU NextGen Linux Builder (dbg)': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop', |
+ 'archive_gpu_tests', 'chrome_with_codecs'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Release', |
+ 'BUILD_CONFIG': 'Debug', |
'TARGET_BITS': 64, |
}, |
- 'test_generators': [ |
- steps.generate_gtest, |
- steps.generate_script, |
- steps.generate_isolated_script, |
+ 'bot_type': 'builder', |
+ 'compile_targets': [ |
], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder', |
'testing': { |
- 'platform': 'mac', |
+ 'platform': 'linux', |
}, |
+ 'use_isolate': True, |
'enable_swarming': True, |
- 'swarming_dimensions': { |
- 'os': 'Mac-10.8', |
- }, |
}, |
- 'Mac10.9 Tests': { |
+ 'Linux NextGen Release (NVIDIA)': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Release', |
'TARGET_BITS': 64, |
}, |
+ 'bot_type': 'tester', |
'test_generators': [ |
steps.generate_gtest, |
steps.generate_script, |
steps.generate_isolated_script, |
], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder', |
+ 'parent_buildername': 'GPU NextGen Linux Builder', |
'testing': { |
- 'platform': 'mac', |
+ 'platform': 'linux', |
}, |
'enable_swarming': True, |
- 'swarming_dimensions': { |
- 'os': 'Mac-10.9', |
- }, |
}, |
- 'Mac10.10 Tests': { |
+ 'Linux NextGen Debug (NVIDIA)': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['mb', 'ninja_confirm_noop'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Release', |
+ 'BUILD_CONFIG': 'Debug', |
'TARGET_BITS': 64, |
}, |
+ 'bot_type': 'tester', |
'test_generators': [ |
steps.generate_gtest, |
steps.generate_script, |
steps.generate_isolated_script, |
], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder', |
+ 'parent_buildername': 'GPU NextGen Linux Builder (dbg)', |
'testing': { |
- 'platform': 'mac', |
+ 'platform': 'linux', |
}, |
+ 'enable_swarming': True, |
}, |
- 'Mac10.11 Tests': { |
+ 'GPU NextGen Mac Builder': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['ninja_confirm_noop', 'archive_gpu_tests', |
+ 'chrome_with_codecs'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Release', |
'TARGET_BITS': 64, |
}, |
- 'test_generators': [ |
- steps.generate_gtest, |
- steps.generate_script, |
- steps.generate_isolated_script, |
+ 'bot_type': 'builder', |
+ 'compile_targets': [ |
], |
- 'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder', |
'testing': { |
'platform': 'mac', |
}, |
- }, |
- 'Mac GN': { |
- 'chromium_config': 'chromium', |
- 'chromium_apply_config': ['mb'], |
- 'gclient_config': 'chromium', |
- 'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Release', |
- 'TARGET_PLATFORM': 'mac', |
- }, |
- 'test_generators': [ |
- steps.generate_gtest, |
- steps.generate_script, |
- steps.generate_isolated_script, |
- ], |
'enable_swarming': True, |
- 'testing': { |
- 'platform': 'mac', |
- }, |
+ 'use_isolate': True, |
}, |
- 'Mac Builder (dbg)': { |
+ 'GPU NextGen Mac Builder (dbg)': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['ninja_confirm_noop'], |
+ 'chromium_apply_config': ['ninja_confirm_noop', 'archive_gpu_tests', |
+ 'chrome_with_codecs'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Debug', |
@@ -166,7 +118,6 @@ SPEC = { |
}, |
'bot_type': 'builder', |
'compile_targets': [ |
- 'chromium_builder_tests', |
], |
'testing': { |
'platform': 'mac', |
@@ -174,12 +125,12 @@ SPEC = { |
'enable_swarming': True, |
'use_isolate': True, |
}, |
- 'Mac10.9 Tests (dbg)': { |
+ 'Mac NextGen 10.10 Retina Release (AMD)': { |
'chromium_config': 'chromium', |
'chromium_apply_config': ['ninja_confirm_noop'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
- 'BUILD_CONFIG': 'Debug', |
+ 'BUILD_CONFIG': 'Release', |
'TARGET_BITS': 64, |
}, |
'test_generators': [ |
@@ -188,29 +139,26 @@ SPEC = { |
steps.generate_isolated_script, |
], |
'bot_type': 'tester', |
- 'parent_buildername': 'Mac Builder (dbg)', |
+ 'parent_buildername': 'GPU NextGen Mac Builder', |
'testing': { |
'platform': 'mac', |
}, |
- 'enable_swarming': True, |
- 'swarming_dimensions': { |
- 'os': 'Mac-10.9', |
- }, |
}, |
- 'Mac GN (dbg)': { |
+ 'Mac NextGen 10.10 Retina Debug (AMD)': { |
'chromium_config': 'chromium', |
- 'chromium_apply_config': ['mb'], |
+ 'chromium_apply_config': ['ninja_confirm_noop'], |
'gclient_config': 'chromium', |
'chromium_config_kwargs': { |
'BUILD_CONFIG': 'Debug', |
- 'TARGET_PLATFORM': 'mac', |
+ 'TARGET_BITS': 64, |
}, |
'test_generators': [ |
steps.generate_gtest, |
steps.generate_script, |
steps.generate_isolated_script, |
], |
- 'enable_swarming': True, |
+ 'bot_type': 'tester', |
+ 'parent_buildername': 'GPU NextGen Mac Builder (dbg)', |
'testing': { |
'platform': 'mac', |
}, |