diff --git a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-cloud-hypervisor-kata-metric8.toml b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml similarity index 91% rename from tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-cloud-hypervisor-kata-metric8.toml rename to tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml index af5c8c6347..7966b69eb9 100644 --- a/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-cloud-hypervisor-kata-metric8.toml +++ b/tests/metrics/cmd/checkmetrics/ci_worker/checkmetrics-json-clh-kata-metric8.toml @@ -16,6 +16,6 @@ description = "measure container lifecycle timings" # within (inclusive) checkvar = ".\"boot-times\".Results | .[] | .\"to-workload\".Result" checktype = "mean" -midval = 0.54 -minpercent = 10.0 -maxpercent = 10.0 +midval = 0.42 +minpercent = 15.0 +maxpercent = 15.0 diff --git a/tests/metrics/gha-run.sh b/tests/metrics/gha-run.sh index fca5c3ff6c..05b426fbce 100755 --- a/tests/metrics/gha-run.sh +++ b/tests/metrics/gha-run.sh @@ -8,6 +8,7 @@ set -o errexit set -o nounset set -o pipefail +set -x kata_tarball_dir="${2:-kata-artifacts}" metrics_dir="$(dirname "$(readlink -f "$0")")" @@ -94,7 +95,7 @@ function check_metrics() { sudo make install popd - local cm_base_file="${checkmetrics_config_dir}/checkmetrics-json-${hypervisor}-$(uname -n).toml" + local cm_base_file="${checkmetrics_config_dir}/checkmetrics-json-clh-kata-metric8.toml" checkmetrics --debug --percentage --basefile "${cm_base_file}" --metricsdir "${results_dir}" cm_result=$? if [ "${cm_result}" != 0 ]; then @@ -110,6 +111,10 @@ function run_test_launchtimes() { exit 0 create_symbolic_links bash tests/metrics/time/launch_times.sh -i public.ecr.aws/ubuntu/ubuntu:latest -n 20 + + if [ "${hypervisor}" = "clh" ]; then + check_metrics + fi } function run_test_memory_usage() { @@ -139,8 +144,6 @@ function main() { run-test-memory-usage-inside-container) run_test_memory_usage_inside_container ;; *) >&2 die "Invalid argument" ;; esac - - check_metrics } main "$@"