New issue
Advanced search Search tips

Issue 764839 link

Starred by 2 users

Issue metadata

Status: Untriaged
Owner: ----
Cc:
EstimatedDays: ----
NextAction: 2019-07-09
OS: ----
Pri: 3
Type: Bug



Sign in to add a comment

samus-chrome-pre-flight-branch failed at PublishUprevChanges stage

Project Member Reported by shuqianz@chromium.org, Sep 13 2017

Issue description

https://uberchromegw.corp.google.com/i/chromeos_release/builders/samus-chrome-pre-flight-branch%20release-R61-9765.B/builds/269

samus-PREFLIGHT_BINHOST.conf: updating PREFLIGHT_BINHOST
Change-Id: Iec39a6c3090a974dd22d865ea6178a9a2b1c9ee1
03:07:22: INFO: Successfully pushed /b/c/cbuild/repository/src/private-overlays/chromeos-partner-overlay to cros-internal merge_branch:refs/heads/release-R61-9765.B
03:07:24: INFO: All changes already pushed for /b/c/cbuild/repository/src/private-overlays/overlay-coral-private. Exiting
03:07:24: INFO: All changes already pushed for /b/c/cbuild/repository/src/private-overlays/overlay-reef-private. Exiting
03:07:26: INFO: All changes already pushed for /b/c/cbuild/repository/src/private-overlays/project-jetstream-private. Exiting
03:07:46: WARNING: HttpsMonitor.send received status 400: {
  "error": {
    "code": 400,
    "message": "Operation was attempted past the valid range.",
    "status": "OUT_OF_RANGE"
  }
}

cros_mark_as_stable: Unhandled exception:
Traceback (most recent call last):
  File "/b/c/cbuild/repository/chromite/bin/cros_mark_as_stable", line 168, in <module>
    DoMain()
  File "/b/c/cbuild/repository/chromite/bin/cros_mark_as_stable", line 164, in DoMain
    commandline.ScriptWrapperMain(FindTarget)
  File "/b/c/cbuild/repository/chromite/lib/commandline.py", line 837, in ScriptWrapperMain
    ret = target(argv[1:])
  File "/b/c/cbuild/repository/chromite/scripts/cros_mark_as_stable.py", line 291, in main
    staging_branch=options.staging_branch)
  File "/b/c/cbuild/repository/chromite/scripts/cros_mark_as_stable.py", line 126, in PushChange
    git.SyncPushBranch(cwd, remote_ref.remote, remote_ref.ref)
  File "/b/c/cbuild/repository/chromite/lib/git.py", line 1300, in SyncPushBranch
    RunGit(git_repo, ['rebase', rebase_target])
  File "/b/c/cbuild/repository/chromite/lib/git.py", line 820, in RunGit
    ['git'] + cmd, **kwargs)
  File "/b/c/cbuild/repository/chromite/lib/retry_util.py", line 243, in GenericRetry
    return _run()
  File "/b/c/cbuild/repository/chromite/lib/retry_util.py", line 176, in _Wrapper
    ret = func(*args, **kwargs)
  File "/b/c/cbuild/repository/chromite/lib/retry_util.py", line 242, in _run
    return functor(*args, **kwargs)
  File "/b/c/cbuild/repository/chromite/lib/cros_build_lib.py", line 645, in RunCommand
    raise RunCommandError(msg, cmd_result)
chromite.lib.cros_build_lib.RunCommandError: return code: 128; command: git rebase refs/remotes/cros/release-R61-9765.B
.git/rebase-apply/patch:2818: new blank line at EOF.
+
.git/rebase-apply/patch:6600: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
error: Could not open metadata/md5-cache/chromeos-base/chromium-source-61.0.3163.90_rc-r1: No such file or directory
error: Failed to merge in the changes.
First, rewinding head to replay your work on top of it...
Applying: Marking 9999 ebuild for sys-kernel/chromeos-kernel-3_8 as stable.
Using index info to reconstruct a base tree...
A	chromeos-base/apmanager/apmanager-0.0.1-r1781.ebuild
A	chromeos-base/arc-networkd/arc-networkd-0.0.1-r666.ebuild
A	chromeos-base/atrusctl/atrusctl-0.0.1-r133.ebuild
......
A	metadata/md5-cache/sys-kernel/chromeos-kernel-3_18-3.18-r1884
A	metadata/md5-cache/sys-kernel/chromeos-kernel-3_8-3.8.11-r613
A	metadata/md5-cache/sys-kernel/chromeos-kernel-4_4-4.4.70-r1006
Falling back to patching base and 3-way merge...
CONFLICT (rename/rename): Rename "metadata/md5-cache/chromeos-base/chromium-source-61.0.3163.89_rc-r1"->"metadata/md5-cache/chromeos-base/chromium-source-61.0.3162.0_rc-r1" in branch "HEAD" rename "metadata/md5-cache/chromeos-base/chromium-source-61.0.3163.89_rc-r1"->"metadata/md5-cache/chromeos-base/chromium-source-61.0.3163.90_rc-r1" in "regen cache"
Patch failed at 0002 regen cache
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
cmd=['git', 'rebase', u'refs/remotes/cros/release-R61-9765.B'], cwd=/b/c/cbuild/repository/src/third_party/chromiumos-overlay
03:07:47: ERROR: 
return code: 1; command: /b/c/cbuild/repository/chromite/bin/cros_mark_as_stable '--srcroot=/b/c/cbuild/repository/src' '--overlays=/b/c/cbuild/repository/src/overlays/overlay-x86-generic:/b/c/cbuild/repository/src/private-overlays/overlay-variant-veyron-tiger-private:/b/c/cbuild/repository/src/private-overlays/overlay-sand-private:/b/c/cbuild/repository/src/overlays/baseboard-coral:/b/c/cbuild/repository/src/overlays/overlay-b....
ground-private:/b/c/cbuild/repository/src/overlays/overlay-pyro:/b/c/cbuild/repository/src/private-overlays/chipset-dakota-private', 'push'], cwd=/b/c/cbuild/repository
03:07:47: ERROR: /b/c/cbuild/repository/chromite/bin/cros_mark_as_stable failed (code=1)
03:07:47: INFO: Translating result /b/c/cbuild/repository/chromite/bin/cros_mark_as_stable failed (code=1) to fail.

There seems like a merge conflict.

After checking the git log of that release branch, I find one CL that uprevs the chromeos source code was submitted on 'Wed Sep 13 02:34:19 2017'. And the failed build ran at 'Wed, 13 Sep 2017 03:07:01 -0700'. So the chromiumos-source and chromeos-chrome uprev conflict with the chromeos uprev. No idea why this happeded. According to Don, in the short term, rerun the release build will fix this conflict. 


 
Cc: -seobrien@chromium.org

Comment 2 by nxia@chromium.org, Jun 8 2018

Cc: -nxia@chromium.org
Labels: Pri-3
NextAction: 2019-07-09
Downgrading P2s that haven't been modified in more than 6 months, which have no component or owner.

Sign in to add a comment