zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix some minor issues with the android bots.

Browse Source 
* Use the same logdog_butler as Chromium instead of redefining one.
* Use luci-auth to prevent "local auth - HTTP 400" errors.

Change-Id: I2a0d1393f9f0e1e41b2bcc9a9fec2c50c19675f3
Bug: None
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/283520
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Jeremy Leconte <jleconte@google.com>
Cr-Commit-Position: refs/heads/main@{#38637}
This commit is contained in:
Jeremy Leconte
2022-11-16 08:26:53 +01:00
committed by WebRTC LUCI CQ
parent d2811761e3
commit e085366aca
7 changed files with 331 additions and 1391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

800
infra/specs/client.webrtc.json
View File

File diff suppressed because it is too large Load Diff

12
infra/specs/mixins.pyl
View File

@ -145,18 +145,6 @@
} }
} }
}, },
'logdog-butler': {
'swarming': {
'cipd_packages': [{
'cipd_package':
'infra/tools/luci/logdog/butler/${platform}',
'location':
'bin',
'revision':
'git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c'
}]
}
},
'mac-m1-cpu': { 'mac-m1-cpu': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {

11
infra/specs/mixins_webrtc.pyl
View File

@ -118,17 +118,6 @@
}, },
} }
}, },
'logdog-butler': {
'swarming': {
'cipd_packages': [
{
"cipd_package": 'infra/tools/luci/logdog/butler/${platform}',
'location': 'bin',
'revision': 'git_revision:ff387eadf445b24c935f1cf7d6ddd279f8a6b04c',
},
],
},
},
'mac-m1-cpu': { 'mac-m1-cpu': {
'swarming': { 'swarming': {
'dimensions': { 'dimensions': {

840
infra/specs/tryserver.webrtc.json
View File

File diff suppressed because it is too large Load Diff

40
infra/specs/waterfalls.pyl
View File

@ -13,8 +13,8 @@
'machines': { 'machines': {
'Android32 (M Nexus5X)': { 'Android32 (M Nexus5X)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests', 'gtest_tests': 'android_tests',
@ -23,8 +23,8 @@
}, },
'Android32 (M Nexus5X)(dbg)': { 'Android32 (M Nexus5X)(dbg)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests', 'gtest_tests': 'android_tests',
@ -33,8 +33,8 @@
}, },
'Android32 (more configs)': { 'Android32 (more configs)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'more_configs_tests', 'gtest_tests': 'more_configs_tests',
@ -45,8 +45,8 @@
'Android32 Builder x86 (dbg)': {}, 'Android32 Builder x86 (dbg)': {},
'Android64 (M Nexus5X)': { 'Android64 (M Nexus5X)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests', 'gtest_tests': 'android_tests',
@ -55,8 +55,8 @@
}, },
'Android64 (M Nexus5X)(dbg)': { 'Android64 (M Nexus5X)(dbg)': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests', 'gtest_tests': 'android_tests',
@ -402,8 +402,8 @@
'machines': { 'machines': {
'android_arm64_dbg': { 'android_arm64_dbg': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests_tryserver', 'gtest_tests': 'android_tests_tryserver',
@ -412,8 +412,8 @@
}, },
'android_arm64_rel': { 'android_arm64_rel': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests_tryserver', 'gtest_tests': 'android_tests_tryserver',
@ -422,8 +422,8 @@
}, },
'android_arm_dbg': { 'android_arm_dbg': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests_tryserver', 'gtest_tests': 'android_tests_tryserver',
@ -432,8 +432,8 @@
}, },
'android_arm_more_configs': { 'android_arm_more_configs': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'more_configs_tests', 'gtest_tests': 'more_configs_tests',
@ -441,8 +441,8 @@
}, },
'android_arm_rel': { 'android_arm_rel': {
'mixins': [ 'mixins': [
'walleye', 'android-devices', 'logdog-butler', 'walleye', 'android-devices', 'has_native_resultdb_integration',
'has_native_resultdb_integration' 'chromium-tester-service-account'
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'android_tests_tryserver', 'gtest_tests': 'android_tests_tryserver',

9
tools_webrtc/mb/mb.py
View File

@ -81,10 +81,11 @@ class WebRTCMetaBuildWrapper(mb.MetaBuildWrapper):
] ]
elif is_android: elif is_android:
cmdline += [ cmdline += [
vpython_exe, '../../build/android/test_wrapper/logdog_wrapper.py', 'luci-auth', 'context', '--', vpython_exe,
'--target', target, '--logdog-bin-cmd', '../../bin/logdog_butler', '../../build/android/test_wrapper/logdog_wrapper.py', '--target',
'--logcat-output-file', '${ISOLATED_OUTDIR}/logcats', target, '--logdog-bin-cmd',
'--store-tombstones' '../../.task_template_packages/logdog_butler', '--logcat-output-file',
'${ISOLATED_OUTDIR}/logcats', '--store-tombstones'
] ]
elif is_ios or is_fuchsia: elif is_ios or is_fuchsia:
cmdline += [ cmdline += [

10
tools_webrtc/mb/mb_unittest.py
View File

@ -324,12 +324,15 @@ class UnitTest(unittest.TestCase):
files, files,
['../../.vpython3', '../../testing/test_env.py', 'foo_unittests']) ['../../.vpython3', '../../testing/test_env.py', 'foo_unittests'])
self.assertEqual(command, [ self.assertEqual(command, [
'luci-auth',
'context',
'--',
'vpython3', 'vpython3',
'../../build/android/test_wrapper/logdog_wrapper.py', '../../build/android/test_wrapper/logdog_wrapper.py',
'--target', '--target',
'foo_unittests', 'foo_unittests',
'--logdog-bin-cmd', '--logdog-bin-cmd',
'../../bin/logdog_butler', '../../.task_template_packages/logdog_butler',
'--logcat-output-file', '--logcat-output-file',
'${ISOLATED_OUTDIR}/logcats', '${ISOLATED_OUTDIR}/logcats',
'--store-tombstones', '--store-tombstones',
@ -363,12 +366,15 @@ class UnitTest(unittest.TestCase):
files, files,
['../../.vpython3', '../../testing/test_env.py', 'foo_unittests']) ['../../.vpython3', '../../testing/test_env.py', 'foo_unittests'])
self.assertEqual(command, [ self.assertEqual(command, [
'luci-auth',
'context',
'--',
'vpython3', 'vpython3',
'../../build/android/test_wrapper/logdog_wrapper.py', '../../build/android/test_wrapper/logdog_wrapper.py',
'--target', '--target',
'foo_unittests', 'foo_unittests',
'--logdog-bin-cmd', '--logdog-bin-cmd',
'../../bin/logdog_butler', '../../.task_template_packages/logdog_butler',
'--logcat-output-file', '--logcat-output-file',
'${ISOLATED_OUTDIR}/logcats', '${ISOLATED_OUTDIR}/logcats',
'--store-tombstones', '--store-tombstones',