From 13c7e55e598130398789033402c44013a2a17e45 Mon Sep 17 00:00:00 2001 From: Zach Koopmans Date: Fri, 3 Feb 2023 10:33:42 -0800 Subject: [PATCH] Ensure only Upload/Download iperf tests run on buildkite. The addition of the "Parameterized" version of iperf requires a filter so that only the original tests run. Otherwise, we get test timeouts. PiperOrigin-RevId: 506938451 --- .buildkite/pipeline.yaml | 2 +- test/benchmarks/network/iperf_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml index 1e22d5a52..294f717f9 100644 --- a/.buildkite/pipeline.yaml +++ b/.buildkite/pipeline.yaml @@ -485,7 +485,7 @@ steps: command: make -i benchmark-platforms BENCHMARKS_FILTER="Continuous" BENCHMARKS_SUITE=httpd BENCHMARKS_TARGETS=test/benchmarks/network:httpd_test - <<: *benchmarks label: ":piedpiper: iperf benchmarks" - command: make -i benchmark-platforms BENCHMARKS_SUITE=iperf BENCHMARKS_TARGETS=test/benchmarks/network:iperf_test + command: make -i benchmark-platforms BENCHMARKS_SUITE=iperf BENCHMARKS_TARGETS=test/benchmarks/network:iperf_test BENCHMARKS_FILTER=BenchmarkIperf$ - <<: *benchmarks label: ":nginx: nginx benchmarks" command: make -i benchmark-platforms BENCHMARKS_FILTER="Continuous" BENCHMARKS_SUITE=nginx BENCHMARKS_TARGETS=test/benchmarks/network:nginx_test diff --git a/test/benchmarks/network/iperf_test.go b/test/benchmarks/network/iperf_test.go index 55b45a071..0db1178df 100644 --- a/test/benchmarks/network/iperf_test.go +++ b/test/benchmarks/network/iperf_test.go @@ -72,7 +72,7 @@ func BenchmarkIperf(b *testing.B) { client := bm.clientFunc(ctx, b) defer client.CleanUp(ctx) - // iperf serves on port 5001 by default. + // iperf server listens on port 5001 by default. port := 5001 // Start the server. @@ -234,7 +234,7 @@ func BenchmarkIperfParameterized(b *testing.B) { client := bm.clientFunc(ctx, b) defer client.CleanUp(ctx) - // iperf serves on port 5001 by default. + // iperf server listens on port 5001 by default. port := 5001 // Start the server.