953226 - Applying patch to mozilla-central on thunderbird try server did twice

Status: RESOLVED INCOMPLETE

(Infrastructure & Operations Graveyard :: CIDuty, task)

Description

[Hiroyuki Ikezoe (:hiro)]

From a build log:
https://tbpl.mozilla.org/php/getParsedLog.php?id=32394965&tree=Thunderbird-Try&full=1#error0

Updated to revision 2b72c62f545044b70c61e4c59a5285010154d591.
applying c:\builds\moz2_slave\tb-try-c-cen-w32-0000000000000\build\mozilla-telemetry-test-fix.patch
 (snip)
Updated to revision 2b72c62f545044b70c61e4c59a5285010154d591.
applying c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\mozilla-telemetry-test-fix.patch
Executing command: ['hg', 'pull', '-R', 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\mozilla', '--time', 'http://hg.mozilla.org/mozilla-central/']
Executing command: ['hg', 'update', '-r', 'default', '-R', 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\mozilla', '--time']
TinderboxPrint:<a href=http://hg.mozilla.org/mozilla-central/rev/cd3e9359fd64 title='Built from mozilla-central revision cd3e9359fd64'>moz:cd3e9359fd64</a>
Executing command: ['hg', 'pull', '-R', 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\ldap\\sdks', '--time']
Executing command: ['hg', 'update', '-r', 'LDAPCSDK_6_0_7F_RTM', '-R', 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\ldap\\sdks', '--time']
TinderboxPrint:<a href=http://hg.mozilla.org/projects/ldap-sdks/rev/2b72c62f5450 title='Built from ldap-sdks revision 2b72c62f5450'>ldap:2b72c62f5450</a>
Executing command: ['hg', 'import', '-R', 'mozilla', '-m', 'local patch from c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\mozilla-telemetry-test-fix.patch', '--no-commit', '--force', 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build\\mozilla-telemetry-test-fix.patch']
c:\builds\moz2_slave\tb-try-c-cen-w32-0000000000000\build\client.mk:455:0: command 'python c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build/client.py checkout --hg-options='--time' --apply-patches --skip-chatzilla --skip-comm --skip-inspector --skip-venkman --tinderbox-print' failed, return code 1
patching file toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js
Hunk #1 FAILED at 229
1 out of 1 hunks FAILED -- saving rejects to file toolkit/components/telemetry/tests/unit/test_TelemetrySendOldPings.js.rej
abort: patch failed to apply


As a result the build failed.

Comment 1

[Justin Wood (:Callek)]

Not sure if there is a quick fix lurking here... I'm leaving the bug in releng, though it glares as build config patching needed.

Comment 2

[Chris Cooper [:coop] (he/him)]

As Callek says, I don't think there's anything for releng to do here.