github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-18 07:18:27 +00:00
Code Issues Projects Releases Wiki Activity

gha: switch CoCo tests on non-TEE to use qemu-coco-dev

Browse Source 
With the addition of the 'qemu-coco-dev' runtimeClass we no longer need
to run CoCo tests on non-TEE environments with 'qemu'. As a result the
tests also no longer need to set the "io.katacontainers.config.hypervisor.image"
annotation to pods.

Signed-off-by: Wainer dos Santos Moschetta <wainersm@redhat.com>
This commit is contained in:
Wainer dos Santos Moschetta
2024-04-25 14:20:13 -03:00
parent c6708726ff
commit 631f6f6ed6
4 changed files with 2 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,7 +9,7 @@ source "${BATS_TEST_DIRNAME}/tests_common.sh"
source "${BATS_TEST_DIRNAME}/../../common.bash"
SUPPORTED_TEE_HYPERVISORS=("qemu-sev" "qemu-snp" "qemu-tdx" "qemu-se")
SUPPORTED_NON_TEE_HYPERVISORS=("qemu")
SUPPORTED_NON_TEE_HYPERVISORS=("qemu-coco-dev")
function setup_unencrypted_confidential_pod() {
get_pod_config_dir
@@ -57,7 +57,5 @@ function confidential_setup() {
ensure_yq
if ! check_hypervisor_for_confidential_tests "${KATA_HYPERVISOR}"; then
return 1
elif [[ " ${SUPPORTED_NON_TEE_HYPERVISORS[*]} " =~ " ${KATA_HYPERVISOR} " ]]; then
info "Need to apply image annotations"
fi
}

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

@@ -31,12 +31,6 @@ setup() {
# debugging.
set_node "$K8S_TEST_YAML" "$node"
if [[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]]; then
set_metadata_annotation "${K8S_TEST_YAML}" \
"io.katacontainers.config.hypervisor.image" \
"/opt/kata/share/kata-containers/kata-containers-confidential.img"
fi
kbs_set_resource "default" "aa" "key" "$test_key"
kbs_set_allow_all_resources
}

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

@@ -47,11 +47,6 @@ setup() {
"io.containerd.cri.runtime-handler" \
"kata-${KATA_HYPERVISOR}"
[[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \
set_metadata_annotation "$kata_pod_with_nydus_config" \
"io.katacontainers.config.hypervisor.image" \
"/opt/kata/share/kata-containers/kata-containers-confidential.img"
# For debug sake
echo "Pod $kata_pod_with_nydus_config file:"
cat $kata_pod_with_nydus_config
@@ -117,11 +112,6 @@ setup() {
"io.containerd.cri.runtime-handler" \
"kata-${KATA_HYPERVISOR}"
[[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \
set_metadata_annotation "$kata_pod_with_nydus_config" \
"io.katacontainers.config.hypervisor.image" \
"/opt/kata/share/kata-containers/kata-containers-confidential.img"
# For debug sake
echo "Pod $kata_pod_with_nydus_config file:"
cat $kata_pod_with_nydus_config
@@ -200,11 +190,6 @@ setup() {
"io.containerd.cri.runtime-handler" \
"kata-${KATA_HYPERVISOR}"
[[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \
set_metadata_annotation "$kata_pod_with_nydus_config" \
"io.katacontainers.config.hypervisor.image" \
"/opt/kata/share/kata-containers/kata-containers-confidential.img"
# For debug sake
echo "Pod $kata_pod_with_nydus_config file:"
cat $kata_pod_with_nydus_config