diff --git a/tests/integration/kubernetes/k8s-confidential-attestation.bats b/tests/integration/kubernetes/k8s-confidential-attestation.bats index 7ce61e822b..eeb536b3e2 100644 --- a/tests/integration/kubernetes/k8s-confidential-attestation.bats +++ b/tests/integration/kubernetes/k8s-confidential-attestation.bats @@ -146,15 +146,22 @@ setup() { kbs_set_cpu0_resource_policy # get measured artifacts from qemu command line of previous test + # Go runtime logs: "launching with: []" + # runtime-rs logs: "qemu args: " log_line=$(sudo journalctl -r -x -t kata | grep -m 1 'launching.*qemu.*with:' || true) - qemu_cmd=$(echo "$log_line" | sed 's/.*with: \[\(.*\)\]".*/\1/') + if [[ -n "$log_line" ]]; then + qemu_cmd=$(echo "$log_line" | sed 's/.*with: \[\(.*\)\]".*/\1/') + else + log_line=$(sudo journalctl -r -x -t kata | grep -m 1 'qemu args:' || true) + qemu_cmd=$(echo "$log_line" | sed 's/.*qemu args: //') + fi [[ -n "$qemu_cmd" ]] || { echo "Could not find QEMU command line"; return 1; } kernel_path=$(echo "$qemu_cmd" | grep -oP -- '-kernel \K[^ ]+') initrd_path=$(echo "$qemu_cmd" | grep -oP -- '-initrd \K[^ ]+' || true) firmware_path=$(echo "$qemu_cmd" | grep -oP -- '-bios \K[^ ]+') vcpu_count=$(echo "$qemu_cmd" | grep -oP -- '-smp \K\d+') - append=$(echo "$qemu_cmd" | sed -n 's/.*-append \(.*\) -bios.*/\1/p') + append=$(echo "$qemu_cmd" | grep -oP -- '-append \K.*?(?= -(smp|bios) )') # Remove escape backslashes for quotes from output for dm-mod.create parameters append="${append//\\\"/\"}"