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.

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

openvswitch: 2.5.4 -> 2.12.0 #53032

Merged
merged 4 commits into from Nov 24, 2019
Merged

openvswitch: 2.5.4 -> 2.12.0 #53032

merged 4 commits into from Nov 24, 2019

Conversation

netixx
Copy link
Contributor

@netixx netixx commented Dec 29, 2018

Openvswitch was upgraded to the latest
stable version (currenty 2.9.2). This remove ovs-monitor-ipsec
commands.

LTS version is still available using
config.virtualisation.vswitch.package = pkgs.openvswitch-lts

This commit is a split from the original PR #35127.

Motivation for this change

Update openvswitch to a more recent version.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@netixx netixx mentioned this pull request Dec 29, 2018
Closed
8 tasks
@netixx netixx force-pushed the update-openvswitch-2.9.2 branch 2 times, most recently from 45d4210 to 9700a54 Compare February 22, 2019 10:08
@netixx
Copy link
Contributor Author

netixx commented Feb 22, 2019

Bumped version to 2.10.1 and 2.5.6. Rebased on current master

@netixx netixx changed the title openvswitch: 2.5.4 -> 2.9.2 openvswitch: 2.5.4 -> 2.10.1 Feb 22, 2019
@netixx
Copy link
Contributor Author

netixx commented Feb 22, 2019

@GrahamcOfBorg build openvswitch-lts
@GrahamcOfBorg build openvswitch

@netixx netixx changed the title openvswitch: 2.5.4 -> 2.10.1 openvswitch: 2.5.4 -> 2.11.0 Mar 2, 2019
@netixx netixx mentioned this pull request Aug 14, 2019
Merged
10 tasks
offlinehacker
offlinehacker reviewed Aug 14, 2019
View reviewed changes
Copy link
Contributor

@offlinehacker offlinehacker left a comment

Choose a reason for hiding this comment

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

Everything else looks good to me, thanks!

pkgs/os-specific/linux/openvswitch/default.nix
substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${python27.interpreter}'
substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${python27.interpreter}'
substituteInPlace xenserver/opt_xensource_libexec_interface-reconfigure --replace '/usr/bin/env python' '${python.interpreter}'
substituteInPlace vtep/ovs-vtep --replace '/usr/bin/env python' '${python.interpreter}'
'';

enableParallelBuilding = true;
doCheck = false; # bash-completion test fails with "compgen: command not found"
Copy link
Contributor

Choose a reason for hiding this comment

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

What if we disable that test?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I just replaced python in the previous code. I guess there was work to try make the test run but in was aborted in the end... Should we comment out the tests if someone wants to pickup the work later or delete the whole thing ?

pkgs/os-specific/linux/openvswitch/lts.nix Show resolved Hide resolved
nixos/modules/virtualisation/openvswitch.nix Show resolved Hide resolved
@offlinehacker
Copy link
Contributor

It's on my agenda for tomorrow to check this pull request and preferably merge it 🙂

@netixx
Copy link
Contributor Author

netixx commented Sep 1, 2019

Rebased to master and resolved conflicts.

I can put myself as a maintainer if this helps!

@netixx
openvswitch: 2.5.4 -> 2.12.0
e8e980e 
Openvswitch was upgraded to the latest
stable version (currenty 2.12.0). This remove ovs-monitor-ipsec
commands.

LTS version is still available using
`config.virtualisation.vswitch.package = pkgs.openvswitch-lts`
it has been upgraded to 2.5.6.

This commit is a split from the original PR NixOS#35127.
@netixx netixx changed the title openvswitch: 2.5.4 -> 2.11.0 openvswitch: 2.5.4 -> 2.12.0 Oct 4, 2019
@netixx
Copy link
Contributor Author

netixx commented Oct 4, 2019

Updated to 2.12.0 (support for 4.19 and 4.20 kernels, which are in use in nixos).
Also added myself as maintainer.

@kmcopper
Copy link
Contributor

I would really appreciate this being merged!

kmcopper and others added 3 commits November 13, 2019 06:07
@kmcopper
maintainers: add kmcopper
d4b8d1e
@kmcopper
openvswitch: many improvements
2011aef 
- tidy maintainer definition
- add kmcopper to maintainers
- use https for url fetch
- update lts to 2.5.9
- compile with openssl 1.1
- use https for homepage url
- use python3 in 2.12
@netixx
Merge pull request #1 from kmcopper/openvswitch-improvements
0f5366d 
openvswitch improvements
@netixx
Copy link
Contributor Author

netixx commented Nov 14, 2019 •
edited

Updated with pull request netixx#1 , thanks @kmcopper

kmcopper
kmcopper approved these changes Nov 14, 2019
View reviewed changes
Copy link
Contributor

@kmcopper kmcopper left a comment •
edited

Choose a reason for hiding this comment

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

Looks good to me. Feel free to rebase on master as needed. Appreciate the merge and hope to get this accepted. Should we plan to backport this to 19.09 and default to the LTS variant for 19.09 since that is the version there currently?

@kmcopper
Copy link
Contributor

@offlinehacker we would greatly appreciate a merge here. Thanks!

@kmcopper kmcopper mentioned this pull request Nov 20, 2019
Closed
10 tasks
fpletz
fpletz approved these changes Nov 24, 2019
View reviewed changes
Copy link
Member

@fpletz fpletz left a comment

Choose a reason for hiding this comment

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

Looks fine. Thanks!

@fpletz fpletz merged commit e315f34 into NixOS:master Nov 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@offlinehacker offlinehacker offlinehacker left review comments

@fpletz fpletz fpletz approved these changes

@kmcopper kmcopper kmcopper approved these changes

@infinisil infinisil Awaiting requested review from infinisil

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@netixx @offlinehacker @kmcopper @fpletz @GrahamcOfBorg