From a01abf16af3e8c11b9ec8db24fede4331925f115 Mon Sep 17 00:00:00 2001 From: marshmallow Date: Wed, 8 Jul 2026 10:06:22 +1000 Subject: [PATCH] fix bench runner --- bench/default.nix | 1 + bench/runner.nix | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bench/default.nix b/bench/default.nix index e5cb926..3c62f30 100644 --- a/bench/default.nix +++ b/bench/default.nix @@ -9,6 +9,7 @@ let nixpkgs.lib.nameValuePair "node_${builtins.toString index}" { imports = [ ./vm.nix + "${flake.inputs.nixpkgs}/nixos/modules/virtualisation/guest-networking-options.nix" flake.checks."x86_64-linux"."bench".nodes."node_${builtins.toString index}".system.build.networkConfig ]; diff --git a/bench/runner.nix b/bench/runner.nix index dccb336..dfc9fdd 100644 --- a/bench/runner.nix +++ b/bench/runner.nix @@ -82,6 +82,7 @@ in --export-markdown stats.md \ --export-json run.json \ "${lib.getExe self'.packages.wire-small} $wire_args_flake" -n "wire@HEAD - flake" \ + --prepare "rm ~/.cache/wire/* || true" "${lib.getExe self'.packages.wire-small} $wire_args_flake" -n "wire@HEAD - flake no-cache" \ "${lib.getExe self'.packages.wire-small} $wire_args_flake_exp_client" -n "wire@HEAD & --experimental-nix-client - flake" \ "${lib.getExe' inputs.colmena_benchmarking.packages.x86_64-linux.colmena "colmena"} $colmena_args_flake" \ -n "colmena@pinned - flake" \ @@ -146,11 +147,10 @@ in machine = globals().get(f"node_{i}") machine.wait_for_unit("sshd.service") # type: ignore - node_deployer.succeed("setup-benchmark"); - node_deployer.succeed("run-benchmark"); + deployer.succeed("setup-benchmark"); + deployer.succeed("run-benchmark"); - node_deployer.copy_from_vm("run.json") - node_deployer.copy_from_vm("stats.json") + deployer.copy_from_machine("stats.md") ''; }; }; -- 2.51.2