github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-31 23:36:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10120 from kata-containers/fix_metrics_json_results_file

Browse Source 
Fix metrics json results file
This commit is contained in:
GabyCT 2024-08-02 11:29:02 -06:00 committed by GitHub
commit aadde2c25b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/common.bash
View File

@ -179,8 +179,8 @@ function extract_kata_env() {
# get the requested memory and num of vcpus from the kata config file.
config_content="$(cat ${RUNTIME_CONFIG_PATH} | grep -vE "^#")"
REQ_MEMORY="$(echo "${config_content}" | grep -i default_memory | cut -d "=" -f2 | awk '{print $1}')"
REQ_NUM_VCPUS="$(echo "${config_content}" | grep -i default_vcpus | cut -d "=" -f2 | awk '{print $1}')"
REQ_MEMORY="$(echo "${config_content}" | grep -i 'default_memory =' | cut -d "=" -f2 | awk '{print $1}')"
REQ_NUM_VCPUS="$(echo "${config_content}" | grep -i 'default_vcpus =' | cut -d "=" -f2 | awk '{print $1}')"
# Shimv2 path is being affected by https://github.com/kata-containers/kata-containers/issues/1151
SHIM_PATH=$(command -v containerd-shim-kata-v2)
@ -188,7 +188,10 @@ function extract_kata_env() {
SHIM_VERSION=${RUNTIME_VERSION}
HYPERVISOR_PATH=$(sudo ${cmd} env --json | jq -r ${hypervisor_path})
HYPERVISOR_PATH=$(echo "${kata_env}" | jq -r ${hypervisor_path})
VIRTIOFSD_PATH=$(echo "${kata_env}" | jq -r ${virtio_fs_daemon_path})
INITRD_PATH=$(echo "${kata_env}" | jq -r ${initrd_path})
# TODO: there is no ${cmd} of rust version currently
if [ "${KATA_HYPERVISOR}" != "dragonball" ]; then
if [ "${KATA_HYPERVISOR}" = "stratovirt" ]; then
@ -197,9 +200,6 @@ function extract_kata_env() {
HYPERVISOR_VERSION=$(sudo -E ${HYPERVISOR_PATH} --version | head -n1)
fi
fi
VIRTIOFSD_PATH=$(sudo ${cmd} env --json | jq -r ${virtio_fs_daemon_path})
INITRD_PATH=$(sudo ${cmd} env --json | jq -r ${initrd_path})
}
# Checks that processes are not running

9
tests/metrics/machine_learning/onednn.sh
View File

@ -49,20 +49,11 @@ EOF
function save_config() {
metrics_json_start_array
pushd "${DEFAULT_KATA_CONFIG_DIR}"
local MEM_AVAIL_MB="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep -i "default_memory =" | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
local NUM_CPUS="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep -i "default_vcpus =" | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
local SHARED_FS="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep shared_fs | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
popd
local json="$(cat << EOF
{
"image": "${IMAGE}",
"units": "ms",
"mode": "Lower Is Better",
"shared-fs": "${SHARED_FS}",
"num-vcpus": "${NUM_CPUS}",
"memory-available-mb": "${MEM_AVAIL_MB}"
}
EOF
)"

9
tests/metrics/machine_learning/openvino.sh
View File

@ -49,20 +49,11 @@ EOF
function save_config() {
metrics_json_start_array
pushd "${DEFAULT_KATA_CONFIG_DIR}"
local MEM_AVAIL_MB="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep -i "default_memory =" | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
local NUM_CPUS="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep -i "default_vcpus =" | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
local SHARED_FS="$(cat ${DEFAULT_KATA_CONFIG_FNAME} | grep shared_fs | cut -d "=" -f2 | tr -d ' ' | tr -d '"')"
popd
local json="$(cat << EOF
{
"image": "${IMAGE}",
"units": "ms",
"mode": "Lower Is Better",
"shared-fs": "${SHARED_FS}",
"num-vcpus": "${NUM_CPUS}",
"memory-available-mb": "${MEM_AVAIL_MB}"
}
EOF
)"