mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-15 06:34:03 +00:00
tests: pull-image: Only skip tests for TEEs
On 1423420
, I've mistakenly disabled the tests entirely, for both
non-TEEs and TEEs.
This happened as I didn't realise that `confidential_setup` would take
non-TEEs into consideration. :-/
Now, let me follow-up on that and make sure that the tests will be
running on non-TEEs.
Signed-off-by: Fabiano Fidêncio <fabiano.fidencio@intel.com>
This commit is contained in:
parent
d875f89fa2
commit
2bc5b1bba2
@ -9,10 +9,14 @@ load "${BATS_TEST_DIRNAME}/lib.sh"
|
|||||||
load "${BATS_TEST_DIRNAME}/confidential_common.sh"
|
load "${BATS_TEST_DIRNAME}/confidential_common.sh"
|
||||||
|
|
||||||
setup() {
|
setup() {
|
||||||
if is_confidential_runtime_class; then
|
if is_confidential_hardware; then
|
||||||
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! is_confidential_runtime_class; then
|
||||||
|
skip "Test not supported for ${KATA_HYPERVISOR}."
|
||||||
|
fi
|
||||||
|
|
||||||
[ "${SNAPSHOTTER:-}" = "nydus" ] || skip "None snapshotter was found but this test requires one"
|
[ "${SNAPSHOTTER:-}" = "nydus" ] || skip "None snapshotter was found but this test requires one"
|
||||||
|
|
||||||
setup_common
|
setup_common
|
||||||
@ -22,10 +26,14 @@ setup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@test "Test we can pull an unencrypted image outside the guest with runc and then inside the guest successfully" {
|
@test "Test we can pull an unencrypted image outside the guest with runc and then inside the guest successfully" {
|
||||||
if is_confidential_runtime_class; then
|
if is_confidential_hardware; then
|
||||||
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! is_confidential_runtime_class; then
|
||||||
|
skip "Test not supported for ${KATA_HYPERVISOR}."
|
||||||
|
fi
|
||||||
|
|
||||||
# 1. Create one runc pod with the $unencrypted_image_1 image
|
# 1. Create one runc pod with the $unencrypted_image_1 image
|
||||||
# We want to have one runc pod, so we pass a fake runtimeclass "runc" and then delete the runtimeClassName,
|
# We want to have one runc pod, so we pass a fake runtimeclass "runc" and then delete the runtimeClassName,
|
||||||
# because the runtimeclass is not optional in new_pod_config function.
|
# because the runtimeclass is not optional in new_pod_config function.
|
||||||
@ -220,10 +228,14 @@ setup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
teardown() {
|
teardown() {
|
||||||
if is_confidential_runtime_class; then
|
if is_confidential_hardware; then
|
||||||
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
skip "Due to issues related to pull-image integration skip tests for ${KATA_HYPERVISOR}."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! is_confidential_runtime_class; then
|
||||||
|
skip "Test not supported for ${KATA_HYPERVISOR}."
|
||||||
|
fi
|
||||||
|
|
||||||
[ "${SNAPSHOTTER:-}" = "nydus" ] || skip "None snapshotter was found but this test requires one"
|
[ "${SNAPSHOTTER:-}" = "nydus" ] || skip "None snapshotter was found but this test requires one"
|
||||||
|
|
||||||
kubectl describe pod "$pod_name"
|
kubectl describe pod "$pod_name"
|
||||||
|
Loading…
Reference in New Issue
Block a user