github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-21 10:51:05 +00:00
Code Issues Projects Releases Wiki Activity

tests: Call repack_secure_image() in set_metadata_annotation()

Browse Source 
It is not good practice to call repack_secure_image() from a bats file
because the test code might not consider cases where `qemu-se` is used
as `KATA_HYPERVISOR`.

This commit moves the function call to set_metadata_annotation() if a key
includes `kernel_params` and `KATA_HYPERVISOR` is set to `qemu-se`, allowing
developers to focus on the test scenario itself.

Signed-off-by: Hyounggyu Choi <Hyounggyu.Choi@ibm.com>
This commit is contained in:
Hyounggyu Choi 2024-07-18 18:09:45 +02:00
parent d2ac01c862
commit a7e4d3b738
3 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/integration/kubernetes/k8s-confidential-attestation.bats
View File

@ -44,15 +44,6 @@ setup() {
set_metadata_annotation "${K8S_TEST_YAML}" \ set_metadata_annotation "${K8S_TEST_YAML}" \
"${kernel_params_annotation}" \ "${kernel_params_annotation}" \
"${kernel_params_value}" "${kernel_params_value}"
# A secure boot image for IBM SE should be rebuilt according to the KBS configuration.
if [ "${KATA_HYPERVISOR}" == "qemu-se" ]; then
if [ -z "${IBM_SE_CREDS_DIR:-}" ]; then
>&2 echo "ERROR: IBM_SE_CREDS_DIR is empty"
return 1
fi
repack_secure_image "${kernel_params_value}" "${IBM_SE_CREDS_DIR}" "true"
fi
} }
@test "Get CDH resource" { @test "Get CDH resource" {

9
tests/integration/kubernetes/k8s-guest-pull-image-authenticated.bats
View File

@ -90,15 +90,6 @@ function create_pod_yaml_with_private_image() {
"${kernel_params_annotation}" \ "${kernel_params_annotation}" \
"${kernel_params_value}" "${kernel_params_value}"
# A secure boot image for IBM SE should be rebuilt according to the KBS configuration.
if [ "${KATA_HYPERVISOR}" == "qemu-se" ]; then
if [ -z "${IBM_SE_CREDS_DIR:-}" ]; then
>&2 echo "ERROR: IBM_SE_CREDS_DIR is empty"
return 1
fi
repack_secure_image "${kernel_params_value} agent.log=debug" "${IBM_SE_CREDS_DIR}" "true"
fi
# Set annotation to pull image in guest # Set annotation to pull image in guest
set_metadata_annotation "${kata_pod_with_private_image}" \ set_metadata_annotation "${kata_pod_with_private_image}" \
"io.containerd.cri.runtime-handler" \ "io.containerd.cri.runtime-handler" \

9
tests/integration/kubernetes/lib.sh
View File

@ -191,6 +191,15 @@ set_metadata_annotation() {
# yq set annotations in yaml. Quoting the key because it can have # yq set annotations in yaml. Quoting the key because it can have
# dots. # dots.
yq -i ".${annotation_key} = \"${value}\"" "${yaml}" yq -i ".${annotation_key} = \"${value}\"" "${yaml}"
if [[ "${key}" =~ kernel_params ]] && [[ "${KATA_HYPERVISOR}" == "qemu-se" ]]; then
# A secure boot image for IBM SE should be rebuilt according to the KBS configuration.
if [ -z "${IBM_SE_CREDS_DIR:-}" ]; then
>&2 echo "ERROR: IBM_SE_CREDS_DIR is empty"
return 1
fi
repack_secure_image "${value}" "${IBM_SE_CREDS_DIR}" "true"
fi
} }
# Set the command for container spec. # Set the command for container spec.