Back to build
Raw log | Switch to full mode | Login

/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/22/264622/11 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/22/264622/11'] 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: 44099 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: 2475c07de9264973b7c7666b6b05d977 JOURNAL_STREAM: 8:18780 LANG: en_US.UTF-8 LOGDOG_COORDINATOR_HOST: logs.chromium.org LOGDOG_STREAM_PREFIX: buildbucket/cr-buildbucket.appspot.com/8918243384577798704 LOGDOG_STREAM_PROJECT: fuchsia LOGDOG_STREAM_SERVER_PATH: unix:/b/s/w/ir/tmp/ld.sock LOGNAME: swarming LUCI_CONTEXT: /b/s/w/itLhRS8z/luci_context.093377641 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-debian-16-6907d2bd-us-central1-b-z9fs SWARMING_EXTERNAL_BOT_SETUP: 1 SWARMING_HEADLESS: 1 SWARMING_SERVER: https://chromium-swarm.appspot.com SWARMING_TASK_ID: 43c08e549bb0a411 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/264622/11" to ref "refs/changes/22/264622/11" TRACE: Run: git rev-parse --verify --quiet change/264622/11 (/b/s/w/ir/k) TRACE: Run: git fetch origin refs/changes/22/264622/11 (/b/s/w/ir/k) TRACE: Run: git branch change/264622/11 FETCH_HEAD (/b/s/w/ir/k) TRACE: Run: git branch -u origin/master change/264622/11 (/b/s/w/ir/k) TRACE: Run: git checkout change/264622/11 (/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=vickiecheng@google.com -c user.name=Vickie Cheng fetch origin master (/b/s/w/ir/k) TRACE: Run: git -c user.email=vickiecheng@google.com -c user.name=Vickie Cheng rebase remotes/origin/master (/b/s/w/ir/k) TRACE: Run: git -c user.email=vickiecheng@google.com -c user.name=Vickie Cheng 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: [basemgr] Convert settings to fidl table Using index info to reconstruct a base tree... M peridot/bin/basemgr/basemgr_settings.cc Falling back to patching base and 3-way merge... Auto-merging peridot/bin/basemgr/basemgr_settings.cc CONFLICT (content): Merge conflict in peridot/bin/basemgr/basemgr_settings.cc Patch failed at 0001 [basemgr] Convert settings to fidl table 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 23:30:21.593 jiri 3.715s 23:30:25.308 23:30:21.593 cmdline parse 0.000s 23:30:21.593 23:30:21.593 cmdline run 3.715s 23:30:25.308 23:30:21.593 find .jiri_root 0.000s 23:30:21.594 23:30:21.594 local projects 0.019s 23:30:21.613 23:30:21.594 load .jiri_root/update_history/latest 0.001s 23:30:21.595 23:30:21.595 match manifest 0.000s 23:30:21.595 23:30:21.595 set revisions 0.018s 23:30:21.613 23:30:21.613 * 3.695s 23:30:25.308 step returned non-zero exit code: 24