Rebase the service-vm branch instead of patches
#23
Conversation
04_ocp_repo_sync.sh
Outdated
| https://github.com/openshift/installer.git | ||
|
|
||
| # NOTE(shadower): we can't just just download and apply the patch here -- the branch has several commits | ||
| pushd "$GOPATH/src/github.com/openshift/installer" |
There was a problem hiding this comment.
The other option is to apply the 3 patches. We can get a patch file per commit. It'd be pretty much like it was before but all coming from the same branch. what do you think?
There was a problem hiding this comment.
Yea I've mentioned that in the commit message. That would mean any change to this branch would require changing ocp-doit to update the commits.
I'm not keen, but we can do that instead, sure.
A third option would be to squash the service-vm commits in your branch. But only you can do that I think.
There was a problem hiding this comment.
Let's squash, lemme do that
There was a problem hiding this comment.
Nice one, thanks!
All changes from that patch were now squashed to flaper87's `service-vm` commit so applying it now would cause git conflicts.
tomassedovic
force-pushed
the
merge-service-vm
branch
from
c923197
to
5bde6a6
Compare
|
Ok with the commits squashed, this PR is just about removing my earlier DNS patch, but it's not applying cleanly it would seem :-( |
|
Ok, I made a mistake. This change actually passes fine, but there's another thing we've got broken later in the ocp_repo_sync script: Line 50 in 57d2d35 I'll merge this PR and we'll need a rebase for cluster-api-provider-openstack. |
Applying patches from the
service-vmbranch now fails because there'smore than one patch we need (and as far as I can tell, github doesn't
let us specify that).
So we could either curl and apply the individual commits (which means
updating ocp-doit every time we make a change to that branch) or just
checking the branch and merging it in.
This change does the latter approach as it's more future-proof.