diff --git a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml index a7217274bf..c852b6ec37 100644 --- a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml +++ b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml @@ -111,14 +111,15 @@ midval = 38656.0 minpercent = 20.0 maxpercent = 20.0 -name = "iperf" +[[metric]] +name = "network-iperf3" type = "json" description = "iperf" # Min and Max values to set a 'range' that # the median of the CSV Results data must fall # within (inclusive) -checkvar = ".\"iperf\".Results | .[] | .jitter.Result" +checkvar = ".\"network-iperf3\".Results | .[] | .jitter.Result" checktype = "mean" -midval = 0.039 -minpercent = 20.0 -maxpercent = 20.0 +midval = 0.044 +minpercent = 30.0 +maxpercent = 30.0 diff --git a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-qemu-kata-metric8.toml b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-qemu-kata-metric8.toml index f3a1bf52ee..66e8f0e22d 100644 --- a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-qemu-kata-metric8.toml +++ b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-qemu-kata-metric8.toml @@ -108,15 +108,18 @@ description = "measure write 90 percentile using fio" checkvar = ".\"fio\".Results | .[] | .write90percentile.Result" checktype = "mean" midval = 37120.0 +minpercent = 20.0 +maxpercent = 20.0 -name = "iperf" +[[metric]] +name = "network-iperf3" type = "json" description = "iperf" # Min and Max values to set a 'range' that # the median of the CSV Results data must fall # within (inclusive) -checkvar = ".\"iperf\".Results | .[] | .jitter.Result" +checkvar = ".\"network-iperf3\".Results | .[] | .jitter.Result" checktype = "mean" -midval = 0.50 -minpercent = 20.0 -maxpercent = 20.0 +midval = 0.041 +minpercent = 30.0 +maxpercent = 30.0 diff --git a/tests/metrics/gha-run.sh b/tests/metrics/gha-run.sh index e17736266c..77ef0fc256 100755 --- a/tests/metrics/gha-run.sh +++ b/tests/metrics/gha-run.sh @@ -87,14 +87,14 @@ function run_test_fio() { info "Running FIO test using ${KATA_HYPERVISOR} hypervisor" bash tests/metrics/storage/fio-k8s/fio-test-ci.sh - - check_metrics } function run_test_iperf() { info "Running Iperf test using ${KATA_HYPERVISOR} hypervisor" bash tests/metrics/network/iperf3_kubernetes/k8s-network-metrics-iperf3.sh -a + + check_metrics } function main() { diff --git a/tests/metrics/network/iperf3_kubernetes/k8s-network-metrics-iperf3.sh b/tests/metrics/network/iperf3_kubernetes/k8s-network-metrics-iperf3.sh index f9d24463b4..9d434e9123 100755 --- a/tests/metrics/network/iperf3_kubernetes/k8s-network-metrics-iperf3.sh +++ b/tests/metrics/network/iperf3_kubernetes/k8s-network-metrics-iperf3.sh @@ -18,8 +18,6 @@ # case 2" # container-server <----> host-client -set -x - set -o pipefail SCRIPT_PATH=$(dirname "$(readlink -f "$0")") @@ -179,6 +177,8 @@ function iperf3_start_deployment() { cmds=("bc" "jq") check_cmds "${cmds[@]}" + init_env + # Check no processes are left behind check_processes