Skip to content

For ipvlan tests check that the ipvlan module is enabled#39358

Merged
kolyshkin merged 1 commit intomoby:masterfrom
jim-docker:testForIpvlan
Jun 24, 2019
Merged

For ipvlan tests check that the ipvlan module is enabled#39358
kolyshkin merged 1 commit intomoby:masterfrom
jim-docker:testForIpvlan

Conversation

@jim-docker
Copy link
Contributor

@jim-docker jim-docker commented Jun 12, 2019

- What I did
Made sure tests that require ipvlan module to be enabled are run only if it is enabled

- How I did it
Added Kir's test for ipvlan module being enabled

- How to verify it
Run TestDockerNetworkIpvlan test with and without ipvlan being enabled

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

@thaJeztah
Copy link
Member

ping @kolyshkin ptal

@GordonTheTurtle GordonTheTurtle added the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jun 12, 2019
@GordonTheTurtle
Copy link

Please sign your commits following these rules:
https://github.com/moby/moby/blob/master/CONTRIBUTING.md#sign-your-work
The easiest way to do this is to amend the last commit:

$ git clone -b "testForIpvlan" [email protected]:jim-docker/moby.git somewhere
$ cd somewhere
$ git rebase -i HEAD~842356984576
editor opens
change each 'pick' to 'edit'
save the file and quit
$ git commit --amend -s --no-edit
$ git rebase --continue # and repeat the amend for each commit
$ git push -f

Amending updates the existing PR. You DO NOT need to open a new one.

@GordonTheTurtle GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Jun 12, 2019
@codecov
Copy link

codecov bot commented Jun 13, 2019

Codecov Report

❗ No coverage uploaded for pull request base (master@fb5fe24). Click here to learn what that means.
The diff coverage is n/a.

@@            Coverage Diff            @@
##             master   #39358   +/-   ##
=========================================
  Coverage          ?      37%           
=========================================
  Files             ?      612           
  Lines             ?    45643           
  Branches          ?        0           
=========================================
  Hits              ?    16890           
  Misses            ?    26471           
  Partials          ?     2282

@kolyshkin
Copy link
Contributor

Two things

  1. No need to check for the kernel version at all, as we already have a better check. Some distros might have backported this functionality to older kernel (and in general these days kernel version doesn't mean much so we only check it as a last resort, i.e. if we have no other way).

  2. Please squash your commits, it's very hard to review it the way it is.

@jim-docker
Copy link
Contributor Author

jim-docker commented Jun 13, 2019

Two things

  1. No need to check for the kernel version at all, as we already have a better check. Some distros might have backported this functionality to older kernel (and in general these days kernel version doesn't mean much so we only check it as a last resort, i.e. if we have no other way).
  2. Please squash your commits, it's very hard to review it the way it is.
  1. OK. I had the impression the problem was with the kernel < 4.2, even if ipvlan is enabled. If not I will remove the version check.

  2. squashing now will make a mess of other reviews, no? Don't you just review the diff between my branch and moby master ("Changes from all commits")?

@kolyshkin
Copy link
Contributor

I had the impression the problem was with the kernel < 4.2, even if ipvlan is enabled. If not I will remove the version check.

Does not matter. We now have better check for the feature, and it's sufficient, so there's absolutely no reason to wrap it into another, much less reliable, check.

Don't you just review the diff

I can and I actually did, as per the comment about kernel version check above.

We still need to squash it anyway before merging, as it's one small logical change and it should be one commit -- otherwise we'll pollute git log

@jim-docker
Copy link
Contributor Author

jim-docker commented Jun 14, 2019

We still need to squash it anyway before merging, as it's one small logical change and it should be one commit -- otherwise we'll pollute git log

I'll squash it, but I recall seeing a checkbox you can select when merging to master to do the squash automatically

…just ensuring the kernel version is greater than 4.2)

Co-Authored-By: Jim Ehrismann <[email protected]>
Co-Authored-By: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Jim Ehrismann <[email protected]>
@thaJeztah
Copy link
Member

I'll squash it, but I recall seeing a checkbox you can select when merging to master to do the squash automatically

We tend not to use that option because;

  • it modifies the contributor's commit
  • commits that were GPG signed by the contributor no longer are signed
  • commits can no longer traced back (or at least; no longer match) the commits in the pull request

Copy link
Member

@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants