/b/s/w/ir/k/cipd/jiri/jiri patch -vv -time '-j=50' -host
https://fuchsia-review.googlesource.com -project fuchsia '-rebase=true' refs/changes/92/283892/4
in dir /b/s/w/ir/k:
allow_subannotations: False
cmd: ['/b/s/w/ir/k/cipd/jiri/jiri',
'patch',
'-vv',
'-time',
'-j=50',
'-host',
'
https://fuchsia-review.googlesource.com',
'-project',
'fuchsia',
'-rebase=true',
'refs/changes/92/283892/4']
env: {}
env_prefixes: {}
env_suffixes: {}
infra_step: True
name_tokens: ('checkout', 'jiri patch')
ok_ret: frozenset([0])
trigger_specs: ()
full environment:
BOTO_CONFIG: /b/s/w/ir/tmp/gsutil-task/.boto
BUILDBUCKET_EXPERIMENTAL: FALSE
CIPD_CACHE_DIR: /b/s/cipd_cache/cache
CIPD_PROTOCOL: v2
DEVSHELL_CLIENT_PORT: 42351
DOCKER_CONFIG: /b/s/w/ir/tmp/docker-cfg-task
DOCKER_TMPDIR: /b/s/w/ir/tmp/docker-tmp-task
GIT_CONFIG_NOSYSTEM: 1
GIT_TERMINAL_PROMPT: 0
HOME: /home/swarming
INFRA_GIT_WRAPPER_HOME: /b/s/w/ir/tmp/git-home-task
INVOCATION_ID: 762dec088aca48ac87ce60caccad81b4
JOURNAL_STREAM: 8:14711
LANG: en_US.UTF-8
LOGDOG_COORDINATOR_HOST: logs.chromium.org
LOGDOG_STREAM_PREFIX: buildbucket/cr-buildbucket.appspot.com/8912540454569136736
LOGDOG_STREAM_PROJECT: fuchsia
LOGDOG_STREAM_SERVER_PATH: unix:/b/s/w/ir/tmp/ld.sock
LOGNAME: swarming
LUCI_CONTEXT: /b/s/w/ir/tmp/luci_context.612950095
MAC_CHROMIUM_TMPDIR: /b/s/w/ir/tmp/t
NO_GCE_CHECK: False
PATH: /b/s/w/ir/cipd_bin_packages:/b/s/w/ir/cipd_bin_packages/bin:/b/s/cipd_cache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD: /b/s/w/ir/k
PYTHONIOENCODING: UTF-8
PYTHONUNBUFFERED: 1
SHELL: /bin/bash
SHLVL: 1
SWARMING_BOT_ID: fuchsia-try-16-us-central1-b-175-g05l
SWARMING_EXTERNAL_BOT_SETUP: 1
SWARMING_HEADLESS: 1
SWARMING_SERVER:
https://chromium-swarm.appspot.com
SWARMING_TASK_ID: 4504baf394009111
TEMP: /b/s/w/ir/tmp/t
TEMPDIR: /b/s/w/ir/tmp/t
TMP: /b/s/w/ir/tmp/t
TMPDIR: /b/s/w/ir/tmp/t
USER: swarming
VPYTHON_VIRTUALENV_ROOT: /b/s/w/ir/cache/vpython
_: /b/s/w/ir/cipd_bin_packages/vpython
TRACE: Run: git rev-list -n 1 HEAD (/b/s/w/ir/k)
TRACE: Run: git rev-list -n 1 HEAD (/b/s/w/ir/k/integration)
Patching project fuchsia(/b/s/w/ir/k) on branch "change/283892/4" to ref "refs/changes/92/283892/4"
TRACE: Run: git rev-parse --verify --quiet change/283892/4 (/b/s/w/ir/k)
TRACE: Run: git fetch origin refs/changes/92/283892/4 (/b/s/w/ir/k)
TRACE: Run: git branch change/283892/4 FETCH_HEAD (/b/s/w/ir/k)
TRACE: Run: git branch -u origin/master change/283892/4 (/b/s/w/ir/k)
TRACE: Run: git checkout change/283892/4 (/b/s/w/ir/k)
Project patched
Rebasing project fuchsia(/b/s/w/ir/k)
TRACE: Run: git log -n 1 --format=format:%cn:%ce HEAD (/b/s/w/ir/k)
TRACE: Run: git -c user.email=mpuryear@google.com -c user.name=Martin Puryear fetch origin master (/b/s/w/ir/k)
TRACE: Run: git -c user.email=mpuryear@google.com -c user.name=Martin Puryear rebase remotes/origin/master (/b/s/w/ir/k)
TRACE: Run: git -c user.email=mpuryear@google.com -c user.name=Martin Puryear rebase --abort (/b/s/w/ir/k)
ERROR: Cannot rebase the change: 'git rebase remotes/origin/master' failed:
stdout:
First, rewinding head to replay your work on top of it...
Applying: [media][tests] Lib to consolidate async interaction
Applying: [media][tests] Eliminate test anti-pattern
Using index info to reconstruct a base tree...
M src/media/audio/audio_core/test/audio_capturer_test.cc
M src/media/audio/audio_core/test/audio_fidl_main.cc
M src/media/audio/audio_core/test/audio_renderer_sync_test.cc
M src/media/audio/audio_core/test/audio_renderer_test.cc
M src/media/audio/audio_core/test/audio_sync_test.cc
M src/media/audio/audio_core/test/audio_test.cc
M src/media/audio/audio_core/test/gain_control_test.cc
Falling back to patching base and 3-way merge...
Auto-merging src/media/audio/audio_core/test/gain_control_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/gain_control_test.cc
Auto-merging src/media/audio/audio_core/test/audio_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/audio_test.cc
Auto-merging src/media/audio/audio_core/test/audio_sync_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/audio_sync_test.cc
Auto-merging src/media/audio/audio_core/test/audio_renderer_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/audio_renderer_test.cc
Auto-merging src/media/audio/audio_core/test/audio_renderer_sync_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/audio_renderer_sync_test.cc
Auto-merging src/media/audio/audio_core/test/audio_fidl_main.cc
Auto-merging src/media/audio/audio_core/test/audio_capturer_test.cc
CONFLICT (content): Merge conflict in src/media/audio/audio_core/test/audio_capturer_test.cc
Patch failed at 0002 [media][tests] Eliminate test anti-pattern
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
stderr:
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
command fail error: exit status 1
22:15:57.202 jiri 5.550s 22:16:02.752
22:15:57.202 cmdline parse 0.000s 22:15:57.202
22:15:57.202 cmdline run 5.550s 22:16:02.752
22:15:57.202 find .jiri_root 0.000s 22:15:57.202
22:15:57.203 local projects 0.019s 22:15:57.222
22:15:57.203 * 0.002s 22:15:57.205
22:15:57.205 load .jiri_root/update_history/latest 0.002s 22:15:57.207
22:15:57.207 match manifest 0.000s 22:15:57.207
22:15:57.207 set revisions 0.015s 22:15:57.222
22:15:57.222 * 5.530s 22:16:02.752
step returned non-zero exit code: 24