gitea-mirror/rosenpass
1
0
Fork 0
mirror of https://github.com/rosenpass/rosenpass.git synced 2026-06-12 11:01:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix wireguard-tools download URLs for legacty-distro-packaging test; fix VM startup timing issue; run nix flake check with only 1 concurrent check (for now for better debugging)

Browse Source
This commit is contained in:
Ilka Schulz
2026-06-05 16:56:09 +02:00
parent 50ba0cb8d0
commit ca4af0a044
6 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/nix.yaml
+1 -1
View File
@@ -351,7 +351,7 @@ jobs:
name: rosenpass
authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
- name: Check
run: nix flake check . --print-build-logs --option min-free 10G
run: nix flake check . --print-build-logs --max-jobs 1 # --option min-free 10G
x86_64-linux---whitepaper-upload:
name: Upload whitepaper x86_64-linux
runs-on: ubicloud-standard-2-ubuntu-2204
tests/integration/rpsc-test.nix
+2 -2
View File
@@ -327,11 +327,11 @@ in
""")
for m in [peerA, peerB, peerakeyexchanger, peerbkeyexchanger]:
m.wait_for_unit("network-online.target")
m.wait_for_unit("network-online.target") # rpsc-test 1
${lib.optionalString multiPeer ''
for m in [peerC, peerckeyexchanger]:
m.wait_for_unit("network-online.target")
m.wait_for_unit("network-online.target") # rpsc-test 2
''}
# Generate the normal wireguard key pairs
tests/legacy-distro-packaging.nix
+20 -13
View File
@@ -6,24 +6,28 @@
let
wg-deb = pkgs.fetchurl {
url = "https://ftp.de.debian.org/debian/pool/main/w/wireguard/wireguard-tools_1.0.20210914-1.1_amd64.deb";
hash = "sha256-s/hCUisQLR19kEbV6d8JXzzTAWUPM+NV0APgHizRGA4=";
url = "https://ftp.de.debian.org/debian/pool/main/w/wireguard/wireguard-tools_1.0.20250521-1_amd64.deb";
hash = "sha256-c8Z1pIAofTxlqOF9XXXnF1w+4PRHRQbCN8xMJlSNunQ=";
# url = "https://ftp.de.debian.org/debian/pool/main/w/wireguard/wireguard-tools_1.0.20210914-1.1_amd64.deb";
# hash = "sha256-s/hCUisQLR19kEbV6d8JXzzTAWUPM+NV0APgHizRGA4=";
};
wg-rpm = pkgs.fetchurl {
url = "https://mirrors.n-ix.net/fedora/linux/releases/40/Everything/x86_64/os/Packages/w/wireguard-tools-1.0.20210914-6.fc40.x86_64.rpm";
hash = "sha256-lh6kCW5gh9bfuOwzjPv96ol1d6u1JTIr/oKH5QbAlK0=";
url = "https://mirrors.n-ix.net/fedora/linux/releases/44/Everything/x86_64/os/Packages/w/wireguard-tools-1.0.20250521-3.fc44.x86_64.rpm";
hash = "sha256-Tue1yrMgUTUzl+I7KO5fPVAYRNxiBDpGoKYohWrfPM8=";
# url = "https://mirrors.n-ix.net/fedora/linux/releases/40/Everything/x86_64/os/Packages/w/wireguard-tools-1.0.20210914-6.fc40.x86_64.rpm";
# hash = "sha256-lh6kCW5gh9bfuOwzjPv96ol1d6u1JTIr/oKH5QbAlK0=";
};
pkgsDirDeb = pkgs.runCommand "packages" { } ''
mkdir $out
cp ${rosenpass-deb} $out/rosenpass.deb
cp ${wg-deb} $out/wireguard.deb
cp ${wg-deb} $out/wireguard-tools.deb
cp ${./prepare-test.sh} $out/prepare-test.sh
'';
pkgsDirRpm = pkgs.runCommand "packages" { } ''
mkdir $out
cp ${rosenpass-rpm} $out/rosenpass.rpm
cp ${wg-rpm} $out/wireguard.rpm
cp ${wg-rpm} $out/wireguard-tools.rpm
cp ${./prepare-test.sh} $out/prepare-test.sh
'';
@@ -41,7 +45,7 @@ let
};
testScript = ''
vm.wait_for_unit("multi-user.target")
vm.succeed("${installPrefix} /mnt/share/wireguard.${suffix}")
vm.succeed("${installPrefix} /mnt/share/wireguard-tools.${suffix}")
vm.succeed("${installPrefix} /mnt/share/rosenpass.${suffix}")
vm.succeed("bash /mnt/share/prepare-test.sh")
@@ -73,6 +77,7 @@ in
suffix = "deb";
source = pkgsDirDeb;
};
package-deb-ubuntu-23_10 = test {
tester = pkgs.testers.nonNixOSDistros.ubuntu."23_10";
installPrefix = "dpkg --install";
@@ -85,12 +90,14 @@ in
suffix = "deb";
source = pkgsDirDeb;
};
package-deb-ubuntu-26_04 = test {
tester = pkgs.testers.nonNixOSDistros.ubuntu."24_04";
installPrefix = "dpkg --install";
suffix = "deb";
source = pkgsDirDeb;
};
# not yet available:
# package-deb-ubuntu-26_04 = test {
# tester = pkgs.testers.nonNixOSDistros.ubuntu."26_04";
# installPrefix = "dpkg --install";
# suffix = "deb";
# source = pkgsDirDeb;
# };
# Fedora 40 is not available for download anymore
# package-rpm-fedora_40 = test {
# tester = pkgs.testers.nonNixOSDistros.fedora."40";
tests/systemd/rosenpass.nix
+3 -1
View File
@@ -156,13 +156,15 @@ in
{ ... }:
''
from os import system
import time
rosenpass = "${pkgs.rosenpass}/bin/rosenpass"
start_all()
for machine in [server, client]:
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("network-online.target")
time.sleep(10)
machine.wait_for_unit("network-online.target") # rosenpass
with subtest("Key, Config, and Service Setup"):
for name, machine, remote in [("server", server, client), ("client", client, server)]:
tests/systemd/rp.nix
+3 -1
View File
@@ -112,13 +112,15 @@ in
{ ... }:
''
from os import system
import time
rp = "${pkgs.rosenpass}/bin/rp"
start_all()
for machine in [server, client]:
machine.wait_for_unit("multi-user.target")
machine.wait_for_unit("network-online.target")
time.sleep(10)
machine.wait_for_unit("network-online.target") # rp
with subtest("Key, Config, and Service Setup"):
for name, machine, remote in [("server", server, client), ("client", client, server)]:
wireguard-tools-1.0.20250521-3.fc44.x86_64.rpm
BIN
View File
Binary file not shown.