Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

jx upgrade boot doesn't fetch the tag to upgrade to, so hits cherry pick error #5974

Closed
abayer opened this issue Oct 29, 2019 · 1 comment · Fixed by #5977
Closed

jx upgrade boot doesn't fetch the tag to upgrade to, so hits cherry pick error #5974

abayer opened this issue Oct 29, 2019 · 1 comment · Fixed by #5977
Assignees
@abayer
Labels
area/boot issues in the `jx boot` command area/fox area/upgrade kind/bug Issue is a bug priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now.
Milestone
Sprint 17

Comments

@abayer
Copy link
Contributor

abayer commented Oct 29, 2019 

➜  jenkins-x-boot-config git:(master) jx upgrade boot  
Upgrade available
using default boot config https://github.com/jenkins-x/jenkins-x-boot-config.git
boot config upgrade available
Upgrading from v1.0.35 to v1.0.36
cherry picking commits in the range 6ca3ee8b5c78590a8312fa8b9bb04a337f024e92..1263ab91e40f6f4fe2d88f33942fca6ec5dc7765
381d34686f85375acc0961b688c6644d41225a05 - Check .Requirements.cluster has a key project in external-dns
error: failed to update boot configuration: failed to cherry pick upgrade commits: cherry-picking 1263ab91e40f6f4fe2d88f33942fca6ec5dc7765: git output: fatal: bad object 1263ab91e40f6f4fe2d88f33942fca6ec5dc7765: failed to run 'git cherry-pick 1263ab91e40f6f4fe2d88f33942fca6ec5dc7765 --strategy=recursive -X theirs' command in directory '/tmp/784375886', output: 'fatal: bad object 1263ab91e40f6f4fe2d88f33942fca6ec5dc7765'

So what's happening here is that 1263ab91e40f6f4fe2d88f33942fca6ec5dc7765 is the release tag commit for v1.0.36, but since we call o.Git().FetchBranch(o.Dir, bootConfigURL, "master"), we don't have that commit in the local repo. We need to fetch the upgrade SHA, not the master branch.
@abayer abayer added kind/bug Issue is a bug priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. area/upgrade area/fox area/boot issues in the `jx boot` command in progress estimate/S labels Oct 29, 2019
@abayer abayer added this to the Sprint 18 milestone Oct 29, 2019
@abayer abayer self-assigned this Oct 29, 2019
@abayer
Copy link
Contributor Author

abayer commented Oct 29, 2019

Think I've got the fix, but I'm working on getting a test written to verify it first.

abayer added a commit to abayer/jx that referenced this issue Oct 29, 2019
@abayer
fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA b…
e9a2e1f 
…efore cherrypicking

Without doing that, the cherry-pick will fail due to the commit from
the release tag not being present in the local boot repo, since it's
not on master.

I had to set a brief sleep between `o.bootConfigRef` calls due to
jenkins-x#5976 causing git to still be
auto-GCing from the first call when it tries to delete and reclone for
the second.

fixes jenkins-x#5974

Signed-off-by: Andrew Bayer <[email protected]>
@abayer abayer mentioned this issue Oct 29, 2019
Merged
2 tasks
@abayer abayer modified the milestones: Sprint 18, Sprint 17 Oct 30, 2019
abayer added a commit to abayer/jx that referenced this issue Oct 30, 2019
@abayer
fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA b…
d090452 
…efore cherrypicking

Without doing that, the cherry-pick will fail due to the commit from
the release tag not being present in the local boot repo, since it's
not on master.

fixes jenkins-x#5974

Signed-off-by: Andrew Bayer <[email protected]>
abayer added a commit to abayer/jx that referenced this issue Oct 30, 2019
@abayer
fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA b…
c8d3796 
…efore cherrypicking

Without doing that, the cherry-pick will fail due to the commit from
the release tag not being present in the local boot repo, since it's
not on master.

fixes jenkins-x#5974

Signed-off-by: Andrew Bayer <[email protected]>
jenkins-x-bot pushed a commit that referenced this issue Oct 30, 2019
@abayer @jenkins-x-bot
fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA b…
26120ed 
…efore cherrypicking

Without doing that, the cherry-pick will fail due to the commit from
the release tag not being present in the local boot repo, since it's
not on master.

fixes #5974

Signed-off-by: Andrew Bayer <[email protected]>
@abayer abayer mentioned this issue Nov 15, 2019
Closed
daveconde pushed a commit to daveconde/jx that referenced this issue Apr 7, 2020
@abayer
fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA b…
e02d65f 
…efore cherrypicking

Without doing that, the cherry-pick will fail due to the commit from
the release tag not being present in the local boot repo, since it's
not on master.

fixes jenkins-x#5974

Signed-off-by: Andrew Bayer <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@abayer abayer

Labels
area/boot issues in the `jx boot` command area/fox area/upgrade kind/bug Issue is a bug priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now.
Projects
None yet
Milestone
Sprint 17
Development

Successfully merging a pull request may close this issue.

fix(boot): 'jx upgrade boot' needs to fetch upgrade boot config SHA before cherrypicking abayer/jx
2 participants
@abayer @deanesmith