| Index: scripts/slave/recipes/chromium.py
|
| diff --git a/scripts/slave/recipes/chromium.py b/scripts/slave/recipes/chromium.py
|
| index 2993f6edbe8fc55dba8ecce63ddd99a18304b57f..11be78a82059319a7c423ce3aa6bfb36857a59b0 100644
|
| --- a/scripts/slave/recipes/chromium.py
|
| +++ b/scripts/slave/recipes/chromium.py
|
| @@ -967,8 +967,8 @@ def GenTests(api):
|
| ],
|
| 'cipd_packages': [
|
| {
|
| - 'location': '{$HOME}/logdog',
|
| - 'cipd_package': 'infra/logdog/linux-386',
|
| + 'location': 'bin',
|
| + 'cipd_package': 'logdog/butler/linux-386',
|
| 'revision': 'git_revision:deadbeef',
|
| },
|
| ],
|
| @@ -985,6 +985,99 @@ def GenTests(api):
|
| )
|
|
|
| yield (
|
| + api.test('dynamic_swarmed_logdog_trigger_test') +
|
| + api.properties.generic(mastername='chromium.linux',
|
| + buildername='Android Tests',
|
| + parent_buildername='Android Builder') +
|
| + api.properties(swarm_hashes={
|
| + 'chrome_public_test_apk': 'cccccccccccccccccc',
|
| + }) +
|
| + api.override_step_data(
|
| + 'read test spec (chromium.linux.json)',
|
| + api.json.output({
|
| + 'Android Tests': {
|
| + 'gtest_tests': [
|
| + {
|
| + 'test': 'chrome_public_test_apk',
|
| + 'swarming': {
|
| + 'can_use_on_swarming_builders': True,
|
| + 'dimension_sets': [
|
| + {
|
| + 'build.id': 'KTU84P',
|
| + 'product.board': 'hammerhead',
|
| + },
|
| + ],
|
| + 'cipd_packages': [
|
| + {
|
| + 'location': 'bin',
|
| + 'cipd_package': 'logdog/butler/linux-386',
|
| + 'revision': 'git_revision:deadbeef',
|
| + },
|
| + {
|
| + 'location': 'bin',
|
| + 'cipd_package': 'some/other/package',
|
| + 'revision': 'git_revision:deadbeef',
|
| + },
|
| + ],
|
| + },
|
| + 'override_compile_targets': [
|
| + 'chrome_public_test_apk'
|
| + ],
|
| + 'override_isolate_target': 'chrome_public_test_apk',
|
| + }
|
| + ],
|
| + },
|
| + })
|
| + )
|
| + )
|
| +
|
| + yield (
|
| + api.test('dynamic_swarmed_no_logdog_test') +
|
| + api.properties.generic(mastername='chromium.linux',
|
| + buildername='Android Tests',
|
| + parent_buildername='Android Builder') +
|
| + api.properties(swarm_hashes={
|
| + 'chrome_public_test_apk': 'cccccccccccccccccc',
|
| + }) +
|
| + api.override_step_data(
|
| + 'read test spec (chromium.linux.json)',
|
| + api.json.output({
|
| + 'Android Tests': {
|
| + 'gtest_tests': [
|
| + {
|
| + 'test': 'chrome_public_test_apk',
|
| + 'swarming': {
|
| + 'can_use_on_swarming_builders': True,
|
| + 'dimension_sets': [
|
| + {
|
| + 'build.id': 'KTU84P',
|
| + 'product.board': 'hammerhead',
|
| + },
|
| + ],
|
| + 'cipd_packages': [
|
| + {
|
| + 'location': 'bin',
|
| + 'cipd_package': 'some/other/package',
|
| + 'revision': 'git_revision:deadbeef',
|
| + },
|
| + {
|
| + 'location': 'bin',
|
| + 'cipd_package': 'another/package',
|
| + 'revision': 'git_revision:deadbeef',
|
| + },
|
| + ],
|
| + },
|
| + 'override_compile_targets': [
|
| + 'chrome_public_test_apk'
|
| + ],
|
| + 'override_isolate_target': 'chrome_public_test_apk',
|
| + }
|
| + ],
|
| + },
|
| + })
|
| + )
|
| + )
|
| + yield (
|
| api.test('dynamic_instrumentation_cloud_test') +
|
| api.properties.generic(mastername='chromium.fyi',
|
| buildername='Android Cloud Tests',
|
|
|