github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-08-23 02:06:47 +00:00
Code Issues Projects Releases Wiki Activity

tests/k8s: Enable tests for qemu-runtime-rs-coco-dev

Browse Source 
Add the runtime class to the non-tee tests and
enable it to run in the test code

Signed-off-by: stevenhorsman <steven@uk.ibm.com>
This commit is contained in:
stevenhorsman 2025-06-23 15:21:41 +01:00
parent abc486ca7c
commit 097c3715e7
6 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/run-kata-coco-tests.yaml vendored
View File

@ -218,6 +218,7 @@ jobs:
matrix: matrix:
vmm: vmm:
- qemu-coco-dev - qemu-coco-dev
- qemu-runtime-rs-coco-dev
snapshotter: snapshotter:
- nydus - nydus
pull-type: pull-type:

2
tests/integration/kubernetes/confidential_common.sh
View File

@ -11,7 +11,7 @@ source "${BATS_TEST_DIRNAME}/../../common.bash"
load "${BATS_TEST_DIRNAME}/confidential_kbs.sh" load "${BATS_TEST_DIRNAME}/confidential_kbs.sh"
SUPPORTED_TEE_HYPERVISORS=("qemu-snp" "qemu-tdx" "qemu-se") SUPPORTED_TEE_HYPERVISORS=("qemu-snp" "qemu-tdx" "qemu-se")
SUPPORTED_NON_TEE_HYPERVISORS=("qemu-coco-dev") SUPPORTED_NON_TEE_HYPERVISORS=("qemu-coco-dev" "qemu-runtime-rs-coco-dev")
function setup_unencrypted_confidential_pod() { function setup_unencrypted_confidential_pod() {
get_pod_config_dir get_pod_config_dir

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

@ -110,7 +110,7 @@ setup() {
# Set CreateContainerRequest timeout for qemu-coco-dev # Set CreateContainerRequest timeout for qemu-coco-dev
if [ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ]; then if [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]]; then
create_container_timeout=300 create_container_timeout=300
set_metadata_annotation "$pod_config" \ set_metadata_annotation "$pod_config" \
"io.katacontainers.config.runtime.create_container_timeout" \ "io.katacontainers.config.runtime.create_container_timeout" \
@ -133,7 +133,7 @@ setup() {
add_allow_all_policy_to_yaml "$pod_config" add_allow_all_policy_to_yaml "$pod_config"
local wait_time=120 local wait_time=120
[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && wait_time=300 [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && wait_time=300
k8s_create_pod "$pod_config" "$wait_time" k8s_create_pod "$pod_config" "$wait_time"
} }
@ -187,7 +187,7 @@ setup() {
[ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838" [ "${KATA_HYPERVISOR}" == "qemu-snp" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
[ "${KATA_HYPERVISOR}" == "qemu-tdx" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838" [ "${KATA_HYPERVISOR}" == "qemu-tdx" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
if [ "${KATA_HYPERVISOR}" = "qemu-coco-dev" ] && [ "${KBS_INGRESS}" = "aks" ]; then if [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && [ "${KBS_INGRESS}" = "aks" ]; then
skip "skip this specific one due to issue https://github.com/kata-containers/kata-containers/issues/10299" skip "skip this specific one due to issue https://github.com/kata-containers/kata-containers/issues/10299"
fi fi
storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX") storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX")
@ -206,7 +206,7 @@ setup() {
# Set CreateContainerRequest timeout in the annotation to pull large image in guest # Set CreateContainerRequest timeout in the annotation to pull large image in guest
create_container_timeout=120 create_container_timeout=120
[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && create_container_timeout=600 [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && create_container_timeout=600
set_metadata_annotation "$pod_config" \ set_metadata_annotation "$pod_config" \
"io.katacontainers.config.runtime.create_container_timeout" \ "io.katacontainers.config.runtime.create_container_timeout" \
"${create_container_timeout}" "${create_container_timeout}"
@ -227,7 +227,7 @@ setup() {
add_allow_all_policy_to_yaml "$pod_config" add_allow_all_policy_to_yaml "$pod_config"
local wait_time=120 local wait_time=120
[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" ] && wait_time=600 [[ "${KATA_HYPERVISOR}" == "qemu-coco-dev" || "${KATA_HYPERVISOR}" == "qemu-runtime-rs-coco-dev" ]] && wait_time=600
k8s_create_pod "$pod_config" "$wait_time" k8s_create_pod "$pod_config" "$wait_time"
} }

2
tests/integration/kubernetes/k8s-initdata.bats
View File

@ -51,7 +51,7 @@ function setup_kbs_image_policy_for_initdata() {
# TODO: Enable for more archs # TODO: Enable for more archs
case "$KATA_HYPERVISOR" in case "$KATA_HYPERVISOR" in
"qemu-tdx"|"qemu-coco-dev"|"qemu-snp") "qemu-tdx"|"qemu-coco-dev"|"qemu-runtime-rs-coco-dev"|"qemu-snp")
;; ;;
*) *)
skip "Test not supported for ${KATA_HYPERVISOR}." skip "Test not supported for ${KATA_HYPERVISOR}."

2
tests/integration/kubernetes/setup.sh
View File

@ -126,7 +126,7 @@ add_runtime_handler_annotations() {
fi fi
case "${KATA_HYPERVISOR}" in case "${KATA_HYPERVISOR}" in
qemu-coco-dev | qemu-snp | qemu-tdx) qemu-coco-dev | qemu-snp | qemu-tdx | qemu-runtime-rs-coco-dev)
info "Add runtime handler annotations for ${KATA_HYPERVISOR}" info "Add runtime handler annotations for ${KATA_HYPERVISOR}"
local handler_value="kata-${KATA_HYPERVISOR}" local handler_value="kata-${KATA_HYPERVISOR}"
for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml

4
tests/integration/kubernetes/tests_common.sh
View File

@ -87,7 +87,7 @@ auto_generate_policy_enabled() {
is_coco_platform() { is_coco_platform() {
case "${KATA_HYPERVISOR}" in case "${KATA_HYPERVISOR}" in
"qemu-tdx"|"qemu-snp"|"qemu-coco-dev") "qemu-tdx"|"qemu-snp"|"qemu-coco-dev"|"qemu-runtime-rs-coco-dev")
return 0 return 0
;; ;;
*) *)
@ -274,7 +274,7 @@ hard_coded_policy_tests_enabled() {
# CI is testing hard-coded policies just on a the platforms listed here. Outside of CI, # CI is testing hard-coded policies just on a the platforms listed here. Outside of CI,
# users can enable testing of the same policies (plus the auto-generated policies) by # users can enable testing of the same policies (plus the auto-generated policies) by
# specifying AUTO_GENERATE_POLICY=yes. # specifying AUTO_GENERATE_POLICY=yes.
local -r enabled_hypervisors=("qemu-coco-dev" "qemu-snp" "qemu-tdx") local -r enabled_hypervisors=("qemu-coco-dev" "qemu-snp" "qemu-tdx" "qemu-runtime-rs-coco-dev")
for enabled_hypervisor in "${enabled_hypervisors[@]}" for enabled_hypervisor in "${enabled_hypervisors[@]}"
do do
if [[ "${enabled_hypervisor}" == "${KATA_HYPERVISOR}" ]]; then if [[ "${enabled_hypervisor}" == "${KATA_HYPERVISOR}" ]]; then