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

[backport] Miniupnpd and bittorrent improvements (#46443) #47956

Merged
merged 5 commits into from Oct 6, 2018

Conversation

samueldr
Copy link
Member

@samueldr samueldr commented Oct 6, 2018

Backport of #46443

That PR fixes a test and adds another test.

[18.09/backport-46443 9dc6bdc] miniupnpd: wrap iptables scripts to use correct PATH
Date: Sat Sep 15 15:07:27 2018 +0200
1 file changed, 14 insertions(+), 2 deletions(-)
[18.09/backport-46443 4342bdd] nixos: miniupnpd: use iptables scripts
Date: Sat Sep 15 15:08:18 2018 +0200
1 file changed, 2 insertions(+), 22 deletions(-)
[18.09/backport-46443 3ab4c76] tests: upnp: init test for upnp using miniupnpd / miniupnpc
Date: Sat Sep 15 15:09:05 2018 +0200
2 files changed, 95 insertions(+)
create mode 100644 nixos/tests/upnp.nix
[18.09/backport-46443 b453212] tests: bittorrent: improve stability
Date: Sat Sep 15 15:15:32 2018 +0200
1 file changed, 66 insertions(+), 33 deletions(-)
[18.09/backport-46443 fc8769d] tests: bittorrent: add bobvanderlinden as maintainer
Date: Sat Sep 15 15:15:50 2018 +0200
1 file changed, 1 insertion(+), 1 deletion(-)

This PR is mainly to satisfy the requirements of testing via CI before merging.

cc @bobvanderlinden

@GrahamcOfBorg test upnp bittorrent

This attempts to improve stability of the test by using existing
services for miniupnpd and transmission.

It also uses explicit addresses for the network interfaces so that the
external IP addresses are valid internet addresses (thus fixing
validation problems from upnpc).

Also disable eth0 from being used to transfer torrents over without that
being the intention.

(cherry picked from commit 276ffc5)
@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: miniupnpd

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: miniupnpd

Partial log (click to expand)

patching script interpreter paths in /nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/init.d/miniupnpd: interpreter directive changed from "/bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/miniupnpd/miniupnpd_functions.sh: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/miniupnpd/ip6tables_removeall.sh: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/miniupnpd/ip6tables_init.sh: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/miniupnpd/iptables_removeall.sh: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/etc/miniupnpd/iptables_init.sh: interpreter directive changed from " /bin/sh" to "/nix/store/fqm2x6kiay1q4vg7pqp4wp17bdijlyc3-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1...
moving /nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/sbin/* to /nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1/bin
/nix/store/hs8sgmc7mixp184jmj3r98qqqq11hz12-miniupnpd-2.1

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: miniupnpd

Partial log (click to expand)

patching script interpreter paths in /nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/init.d/miniupnpd: interpreter directive changed from "/bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/miniupnpd/iptables_removeall.sh: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/miniupnpd/miniupnpd_functions.sh: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/miniupnpd/iptables_init.sh: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/miniupnpd/ip6tables_removeall.sh: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/etc/miniupnpd/ip6tables_init.sh: interpreter directive changed from " /bin/sh" to "/nix/store/czx8vkrb9jdgjyz8qfksh10vrnqa723l-bash-4.4-p23/bin/sh"
checking for references to /build in /nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1...
moving /nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/sbin/* to /nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1/bin
/nix/store/sfn8zwgfz0h3hiq4gj5imniyn6wr7c03-miniupnpd-2.1

@bobvanderlinden
Copy link
Member

👍

@samueldr
Copy link
Member Author

samueldr commented Oct 6, 2018

Hmm, not sure why the tests don't seem to have triggered?

@GrahamcOfBorg test upnp bittorrent

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: tests.upnp, tests.bittorrent

Partial log (click to expand)

killing client2 (pid 598)
killing tracker (pid 610)
killing router (pid 621)
killing client1 (pid 633)
vde_switch: vde_switch: EOF on stdin, cleaning up and exiting
EOF on stdin, cleaning up and exiting
vde_switch: vde_switch: Could not remove ctl dir '/build/vde2.ctl': Directory not empty
Could not remove ctl dir '/build/vde1.ctl': Directory not empty
/nix/store/31f426shpb30iwgc7jk4gpp2zhhrnp0h-vm-test-run-upnp
/nix/store/c9fsq9jb2ms3grkdy642qn1zm9qdf4ww-vm-test-run-bittorrent

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: tests.upnp, tests.bittorrent

Partial log (click to expand)

cleaning up
killing router (pid 632)
killing client1 (pid 645)
killing client2 (pid 658)
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: EOF on stdin, cleaning up and exiting
vde_switch: vde_switch: Could not remove ctl dir '/build/vde2.ctl': Directory not emptyCould not remove ctl dir '/build/vde1.ctl': Directory not empty

/nix/store/4hp58j2xcvzgj72r29ybc8clawj82jd3-vm-test-run-upnp
/nix/store/a0jmpks2x5ja2mv4bcxvyj7fx74iykai-vm-test-run-bittorrent

@samueldr samueldr merged commit f4bb9c4 into NixOS:release-18.09 Oct 6, 2018
@samueldr samueldr deleted the 18.09/backport-46443 branch February 12, 2019 02:26
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.

None yet

3 participants