| Message ID | 20210506152548.29597-2-david.marchand@redhat.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Rebase and fixes for 21.05. | expand |
On 06/05/2021 16:25, David Marchand wrote: > Make this branch point to current main master branch so that we can > track API breakage. > s/master// > Note: this should not be merged to master, intended for dpdk-latest > branch only. > It's probably better to give full project/branch names when branches from dpdk and ovs are referred to in the commit log. e.g. "dpdk main branch". It would get confusing for someone not familiar. > Signed-off-by: David Marchand <david.marchand@redhat.com> > Acked-by: Ilya Maximets <i.maximets@ovn.org> > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > The default branch name in DPDK is changed from master to main. > This patch reflects the same on travis builds for dpdk-latest branch. > > Tested-at: https://travis-ci.org/github/Sunil-Pai-G/ovs-copy/builds/723223426 "We couldn't display the repository Sunil-Pai-G/ovs-copy". > Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> > Signed-off-by: Ian Stokes <ian.stokes@intel.com> It's a very small patch to be squashed patches with multiple signoffs? Ignore comment if commit log makes sense, but checkpatch is complaining too. WARNING: Unexpected sign-offs from developers who are not authors or co-authors or committers: Ian Stokes <ian.stokes@intel.com>, Sunil Pai G <sunil.pai.g@intel.com>, Ian Stokes <ian.stokes@intel.com> Lines checked: 36, Warnings: 1, Errors: 0 > --- > .travis.yml | 4 +++- > 1 file changed, 3 insertions(+), 1 deletion(-) > > diff --git a/.travis.yml b/.travis.yml > index 51d0511080..7e87360256 100644 > --- a/.travis.yml > +++ b/.travis.yml > @@ -30,7 +30,9 @@ addons: > > before_install: ./.ci/${TRAVIS_OS_NAME}-prepare.sh > > -before_script: export PATH=$PATH:$HOME/bin > +before_script: > + - export PATH=$PATH:$HOME/bin > + - export DPDK_VER=refs/heads/main > > matrix: > include: >
> On 06/05/2021 16:25, David Marchand wrote: > > Make this branch point to current main master branch so that we can > > track API breakage. > > > > s/master// I can strip out master above and keep it as main on commit. > > > Note: this should not be merged to master, intended for dpdk-latest > > branch only. > > > > It's probably better to give full project/branch names when branches > from dpdk and ovs are referred to in the commit log. e.g. "dpdk main > branch". It would get confusing for someone not familiar. Agreed, can make this change on commit. > > > Signed-off-by: David Marchand <david.marchand@redhat.com> > > Acked-by: Ilya Maximets <i.maximets@ovn.org> > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > The default branch name in DPDK is changed from master to main. > > This patch reflects the same on travis builds for dpdk-latest branch. > > > > Tested-at: https://travis-ci.org/github/Sunil-Pai-G/ovs- > copy/builds/723223426 > > "We couldn't display the repository Sunil-Pai-G/ovs-copy". Yes looks like this isn't available anymore, also this points to travis-ci.org, this is set to be removed completely in a few weeks and changed to travis-ci.com. As such it probably doesn't make sense to have the tested by tag above as is. As this will never be in an release we could just remove it, otherwise wait for a new tag from travis-ci.com. As the change is small I thinks its ok to remove? Thoughts? > > > Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > It's a very small patch to be squashed patches with multiple signoffs? > Ignore comment if commit log makes sense, but checkpatch is complaining > too. > > WARNING: Unexpected sign-offs from developers who are not authors or > co-authors or committers: Ian Stokes <ian.stokes@intel.com>, Sunil Pai G > <sunil.pai.g@intel.com>, Ian Stokes <ian.stokes@intel.com> > Lines checked: 36, Warnings: 1, Errors: 0 I think it's minor, can add a co-author and sign off for Sunil here to avoid the error? As David has done the rebase maybe that’s the correct approach? BR Ian > > > --- > > .travis.yml | 4 +++- > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > diff --git a/.travis.yml b/.travis.yml > > index 51d0511080..7e87360256 100644 > > --- a/.travis.yml > > +++ b/.travis.yml > > @@ -30,7 +30,9 @@ addons: > > > > before_install: ./.ci/${TRAVIS_OS_NAME}-prepare.sh > > > > -before_script: export PATH=$PATH:$HOME/bin > > +before_script: > > + - export PATH=$PATH:$HOME/bin > > + - export DPDK_VER=refs/heads/main > > > > matrix: > > include: > >
> > On 06/05/2021 16:25, David Marchand wrote: > > > Make this branch point to current main master branch so that we can > > > track API breakage. > > > > > > > s/master// > > I can strip out master above and keep it as main on commit. > > > > > > Note: this should not be merged to master, intended for dpdk-latest > > > branch only. > > > > > > > It's probably better to give full project/branch names when branches > > from dpdk and ovs are referred to in the commit log. e.g. "dpdk main > > branch". It would get confusing for someone not familiar. > > Agreed, can make this change on commit. > > > > > > Signed-off-by: David Marchand <david.marchand@redhat.com> > > > Acked-by: Ilya Maximets <i.maximets@ovn.org> > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > > > The default branch name in DPDK is changed from master to main. > > > This patch reflects the same on travis builds for dpdk-latest branch. > > > > > > Tested-at: https://travis-ci.org/github/Sunil-Pai-G/ovs- > > copy/builds/723223426 > > > > "We couldn't display the repository Sunil-Pai-G/ovs-copy". > > Yes looks like this isn't available anymore, also this points to travis-ci.org, this > is set to be removed completely in a few weeks and changed to travis- > ci.com. > > As such it probably doesn't make sense to have the tested by tag above as is. > As this will never be in an release we could just remove it, otherwise wait for > a new tag from travis-ci.com. > > As the change is small I thinks its ok to remove? Thoughts? > > > > > > Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > It's a very small patch to be squashed patches with multiple signoffs? > > Ignore comment if commit log makes sense, but checkpatch is complaining > > too. > > > > WARNING: Unexpected sign-offs from developers who are not authors or > > co-authors or committers: Ian Stokes <ian.stokes@intel.com>, Sunil Pai G > > <sunil.pai.g@intel.com>, Ian Stokes <ian.stokes@intel.com> > > Lines checked: 36, Warnings: 1, Errors: 0 > > I think it's minor, can add a co-author and sign off for Sunil here to avoid the > error? As David has done the rebase maybe that’s the correct approach? > > > BR > Ian > > > > > --- > > > .travis.yml | 4 +++- > > > 1 file changed, 3 insertions(+), 1 deletion(-) > > > > > > diff --git a/.travis.yml b/.travis.yml > > > index 51d0511080..7e87360256 100644 > > > --- a/.travis.yml > > > +++ b/.travis.yml > > > @@ -30,7 +30,9 @@ addons: > > > > > > before_install: ./.ci/${TRAVIS_OS_NAME}-prepare.sh > > > > > > -before_script: export PATH=$PATH:$HOME/bin > > > +before_script: > > > + - export PATH=$PATH:$HOME/bin > > > + - export DPDK_VER=refs/heads/main > > > > > > matrix: > > > include: > > > > Hi all, I didn't see anymore comments on above, following he patch sync last week and the discussion had there I'm happy to update the commit message, remove the tested tag and push the series to dpdk-latest. Regards Ian > _______________________________________________ > dev mailing list > dev@openvswitch.org > https://mail.openvswitch.org/mailman/listinfo/ovs-dev
Hi Ian, On Wed, May 19, 2021 at 1:23 PM Stokes, Ian <ian.stokes@intel.com> wrote: > > > > On 06/05/2021 16:25, David Marchand wrote: > > > > Make this branch point to current main master branch so that we can > > > > track API breakage. > > > > > > > > > > s/master// > > > > I can strip out master above and keep it as main on commit. > > > > > > > > > Note: this should not be merged to master, intended for dpdk-latest > > > > branch only. > > > > > > > > > > It's probably better to give full project/branch names when branches > > > from dpdk and ovs are referred to in the commit log. e.g. "dpdk main > > > branch". It would get confusing for someone not familiar. > > > > Agreed, can make this change on commit. > > > > > > > > > Signed-off-by: David Marchand <david.marchand@redhat.com> > > > > Acked-by: Ilya Maximets <i.maximets@ovn.org> > > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > > > > > The default branch name in DPDK is changed from master to main. > > > > This patch reflects the same on travis builds for dpdk-latest branch. > > > > > > > > Tested-at: https://travis-ci.org/github/Sunil-Pai-G/ovs- > > > copy/builds/723223426 > > > > > > "We couldn't display the repository Sunil-Pai-G/ovs-copy". > > > > Yes looks like this isn't available anymore, also this points to travis-ci.org, this > > is set to be removed completely in a few weeks and changed to travis- > > ci.com. > > > > As such it probably doesn't make sense to have the tested by tag above as is. > > As this will never be in an release we could just remove it, otherwise wait for > > a new tag from travis-ci.com. > > > > As the change is small I thinks its ok to remove? Thoughts? > > > > > > > > > Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> > > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > > > It's a very small patch to be squashed patches with multiple signoffs? > > > Ignore comment if commit log makes sense, but checkpatch is complaining > > > too. > > > > > > WARNING: Unexpected sign-offs from developers who are not authors or > > > co-authors or committers: Ian Stokes <ian.stokes@intel.com>, Sunil Pai G > > > <sunil.pai.g@intel.com>, Ian Stokes <ian.stokes@intel.com> > > > Lines checked: 36, Warnings: 1, Errors: 0 > > > > I think it's minor, can add a co-author and sign off for Sunil here to avoid the > > error? As David has done the rebase maybe that’s the correct approach? > > > I didn't see anymore comments on above, following he patch sync last week and the discussion had there I'm happy to update the commit message, remove the tested tag and push the series to dpdk-latest. Either leaving as is (since this is a rebase) or rewriting the commitlogs are both fine to me. Thanks!
> Hi Ian, > > On Wed, May 19, 2021 at 1:23 PM Stokes, Ian <ian.stokes@intel.com> wrote: > > > > > > On 06/05/2021 16:25, David Marchand wrote: > > > > > Make this branch point to current main master branch so that we can > > > > > track API breakage. > > > > > > > > > > > > > s/master// > > > > > > I can strip out master above and keep it as main on commit. > > > > > > > > > > > > Note: this should not be merged to master, intended for dpdk-latest > > > > > branch only. > > > > > > > > > > > > > It's probably better to give full project/branch names when branches > > > > from dpdk and ovs are referred to in the commit log. e.g. "dpdk main > > > > branch". It would get confusing for someone not familiar. > > > > > > Agreed, can make this change on commit. > > > > > > > > > > > > Signed-off-by: David Marchand <david.marchand@redhat.com> > > > > > Acked-by: Ilya Maximets <i.maximets@ovn.org> > > > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > > > > > > > The default branch name in DPDK is changed from master to main. > > > > > This patch reflects the same on travis builds for dpdk-latest branch. > > > > > > > > > > Tested-at: https://travis-ci.org/github/Sunil-Pai-G/ovs- > > > > copy/builds/723223426 > > > > > > > > "We couldn't display the repository Sunil-Pai-G/ovs-copy". > > > > > > Yes looks like this isn't available anymore, also this points to travis-ci.org, > this > > > is set to be removed completely in a few weeks and changed to travis- > > > ci.com. > > > > > > As such it probably doesn't make sense to have the tested by tag above > as is. > > > As this will never be in an release we could just remove it, otherwise wait > for > > > a new tag from travis-ci.com. > > > > > > As the change is small I thinks its ok to remove? Thoughts? > > > > > > > > > > > > Signed-off-by: Sunil Pai G <sunil.pai.g@intel.com> > > > > > Signed-off-by: Ian Stokes <ian.stokes@intel.com> > > > > > > > > It's a very small patch to be squashed patches with multiple signoffs? > > > > Ignore comment if commit log makes sense, but checkpatch is > complaining > > > > too. > > > > > > > > WARNING: Unexpected sign-offs from developers who are not authors > or > > > > co-authors or committers: Ian Stokes <ian.stokes@intel.com>, Sunil Pai > G > > > > <sunil.pai.g@intel.com>, Ian Stokes <ian.stokes@intel.com> > > > > Lines checked: 36, Warnings: 1, Errors: 0 > > > > > > I think it's minor, can add a co-author and sign off for Sunil here to avoid > the > > > error? As David has done the rebase maybe that’s the correct approach? > > > > > I didn't see anymore comments on above, following he patch sync last > week and the discussion had there I'm happy to update the commit > message, remove the tested tag and push the series to dpdk-latest. > > Either leaving as is (since this is a rebase) or rewriting the > commitlogs are both fine to me. > Thanks! Thanks David, dpdk-latest is rebased on ovs-master and these are applied. Travis is in the green https://travis-ci.org/github/openvswitch/ovs/builds/771661238 We're thinking of looking at updating the github actions ci to maybe handle dpdk-latest also, although this may require some re-design on how we ci currently works. This is just to have a replacement for when Travis.org eventually shuts down. Will keep you in the loop. Thanks for these. Regards Ian > > -- > David Marchand
On Wed, May 19, 2021 at 1:48 PM Stokes, Ian <ian.stokes@intel.com> wrote: > > > I didn't see anymore comments on above, following he patch sync last > > week and the discussion had there I'm happy to update the commit > > message, remove the tested tag and push the series to dpdk-latest. > > > > Either leaving as is (since this is a rebase) or rewriting the > > commitlogs are both fine to me. > > Thanks! > > Thanks David, dpdk-latest is rebased on ovs-master and these are applied. > > Travis is in the green > > https://travis-ci.org/github/openvswitch/ovs/builds/771661238 > > We're thinking of looking at updating the github actions ci to maybe handle dpdk-latest also, although this may require some re-design on how we ci currently works. Argh, I had seen the issue in GHA, but broke my branch when rebasing/testing with my own dpdk repo. This could be squashed in the first patch of the dpdk-latest branch: --------------------- .github/workflows/build-and-test.yml --------------------- index e2350c6d9d..6638d1658f 100644 @@ -17,6 +17,7 @@ jobs: DEB_PACKAGE: ${{ matrix.deb_package }} DPDK: ${{ matrix.dpdk }} DPDK_SHARED: ${{ matrix.dpdk_shared }} + DPDK_VER: refs/heads/main KERNEL: ${{ matrix.kernel }} KERNEL_LIST: ${{ matrix.kernel_list }} LIBS: ${{ matrix.libs }}
diff --git a/.travis.yml b/.travis.yml index 51d0511080..7e87360256 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,9 @@ addons: before_install: ./.ci/${TRAVIS_OS_NAME}-prepare.sh -before_script: export PATH=$PATH:$HOME/bin +before_script: + - export PATH=$PATH:$HOME/bin + - export DPDK_VER=refs/heads/main matrix: include: