[ovs-dev] [PATCH v3] ovn-controller: Fix parsing of OVN tunnel IDs

[Aaron Conole]

Aaron Conole <aconole at bytheb.org> writes:

> Numan Siddique <nusiddiq at redhat.com> writes:
>
>> On Mon, May 27, 2019, 4:01 PM Dumitru Ceara <dceara at redhat.com> wrote:
>>
>>  On Mon, May 27, 2019 at 11:57 AM 0-day Robot <robot at bytheb.org> wrote:
>>  >
>>  > Bleep bloop.  Greetings Dumitru Ceara, I am a robot and I have tried out your patch.
>>  > Thanks for your contribution.
>>  >
>>  > I encountered some error that I wasn't expecting.  See the details below.
>>  >
>>  >
>>  > git-am:
>>  > fatal: sha1 information is lacking or useless (ovn/controller/bfd.c).
>>  > Repository lacks necessary blobs to fall back on 3-way merge.
>>  > Cannot fall back to three-way merge.
>>  > Patch failed at 0001 ovn-controller: Fix parsing of OVN tunnel IDs
>>  > The copy of the patch that failed is found in:
>>  >    /var/lib/jenkins/jobs/upstream_build_from_pw/workspace/OVN/.git/rebase-apply/patch
>>  > When you have resolved this problem, run "git am --resolved".
>>  > If you prefer to skip this patch, run "git am --skip" instead.
>>  > To restore the original branch and stop patching, run "git am --abort".
>>  >
>>  >
>>  > Please check this out.  If you feel there has been an error,
>>  > please email aconole at bytheb.org
>>  >
>>  > Thanks,
>>  > 0-day Robot
>>
>>  Hi Aaron,
>>
>>  I'm not sure what the problem is here. Can it be related to what the
>>  bot is doing?
>>
>>  For the v3 version I had updated the master branch and rebased the dev
>>  branch; then I generated the patch from my dev branch with:
>>  git format-patch -M master --subject-prefix="PATCH v3"  -o _patch/
>>
>>  If i apply the patch with "git am" everything seems to work fine:
>>  $ git checkout -b test origin/master
>>  $ git am _patch/0001-ovn-controller-Fix-parsing-of-OVN-tunnel-IDs.patch
>>  Applying: ovn-controller: Fix parsing of OVN tunnel IDs
>>  $ git log --oneline -1
>>  8c559d4 ovn-controller: Fix parsing of OVN tunnel IDs
>>  $ git --version
>>  git version 1.8.3.1
>>
>> Looks like the bot is trying to apply the patches to the ovn-org/ovn repo.
>
> I'll double check - I thought I had a regex that was correctly
> separating it.

Should be all set.

>> Aaron is it possible to change the bot to apply the patches to the
>> new repo only if "ovn" is with in the [*ovn*] ?
>
> That's the intention.
>
>> Right now we use  -  "[PATCH ..]ovn: ... " for OVN related patches in the openvswitch repo.
>
> Right.
>
>> Thanks
>> Numan
>>
>>  If I use git-pw it also seems to work fine:
>>  $ git checkout -b test2 origin/master
>>  Branch test2 set up to track remote branch master from origin.
>>  Switched to a new branch 'test2'
>>  $ git-pw patch apply 1105697
>>  Starting new HTTPS connection (1): patchwork.ozlabs.org
>>  Starting new HTTPS connection (1): patchwork.ozlabs.org
>>  Applying: ovn-controller: Fix parsing of OVN tunnel IDs
>>  $ git log --oneline -1
>>  aa83849 ovn-controller: Fix parsing of OVN tunnel IDs
>>
>>  Thanks,
>>  Dumitru
>>  _______________________________________________
>>  dev mailing list
>>  dev at openvswitch.org
>>  https://mail.openvswitch.org/mailman/listinfo/ovs-dev
> _______________________________________________
> dev mailing list
> dev at openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev