github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-04 10:24:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10841 from BbolroC/make-measured-rootfs-configurable

Browse Source 
local-build: Do not build measured rootfs on s390x
This commit is contained in:
Hyounggyu Choi
2025-02-06 16:07:15 +01:00
committed by GitHub
parent 6de8e59109 1bdb34e880
commit 48c5b1fb55
3 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,6 +89,7 @@ setup() {
} }
@test "Test we can pull an image inside the guest using trusted storage" { @test "Test we can pull an image inside the guest using trusted storage" {
[ "$(uname -m)" == "s390x" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
# The image pulled in the guest will be downloaded and unpacked in the `/run/kata-containers/image` directory. # The image pulled in the guest will be downloaded and unpacked in the `/run/kata-containers/image` directory.
# The tests will use `cryptsetup` to encrypt a block device and mount it at `/run/kata-containers/image`. # The tests will use `cryptsetup` to encrypt a block device and mount it at `/run/kata-containers/image`.
@@ -136,6 +137,7 @@ setup() {
} }
@test "Test we cannot pull a large image that pull time exceeds createcontainer timeout inside the guest" { @test "Test we cannot pull a large image that pull time exceeds createcontainer timeout inside the guest" {
[ "$(uname -m)" == "s390x" ] && skip "See: https://github.com/kata-containers/kata-containers/issues/10838"
storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX") storage_config=$(mktemp "${BATS_FILE_TMPDIR}/$(basename "${storage_config_template}").XXX")
local_device=$(create_loop_device) local_device=$(create_loop_device)
@@ -178,6 +180,7 @@ setup() {
} }
@test "Test we can pull a large image inside the guest with large createcontainer timeout" { @test "Test we can pull a large image inside the guest with large createcontainer timeout" {
[ "$(uname -m)" == "s390x" ] && 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" ] && [ "${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"

3
tests/integration/kubernetes/k8s-measured-rootfs.bats
View File

@@ -12,6 +12,9 @@ load "${BATS_TEST_DIRNAME}/tests_common.sh"
check_and_skip() { check_and_skip() {
case "${KATA_HYPERVISOR}" in case "${KATA_HYPERVISOR}" in
qemu-tdx|qemu-coco-dev) qemu-tdx|qemu-coco-dev)
if [ "$(uname -m)" == "s390x" ]; then
skip "measured rootfs tests not implemented for s390x"
fi
return return
;; ;;
*) *)

21
tools/packaging/kata-deploy/local-build/kata-deploy-binaries.sh
View File

@@ -389,7 +389,11 @@ install_image() {
#Install guest image for confidential guests #Install guest image for confidential guests
install_image_confidential() { install_image_confidential() {
export MEASURED_ROOTFS=yes if [ "${ARCH}" == "s390x" ]; then
export MEASURED_ROOTFS=no
else
export MEASURED_ROOTFS=yes
fi
export PULL_TYPE=default export PULL_TYPE=default
install_image "confidential" install_image "confidential"
} }
@@ -467,7 +471,11 @@ install_initrd() {
#Install guest initrd for confidential guests #Install guest initrd for confidential guests
install_initrd_confidential() { install_initrd_confidential() {
export MEASURED_ROOTFS=yes if [ "${ARCH}" == "s390x" ]; then
export MEASURED_ROOTFS=no
else
export MEASURED_ROOTFS=yes
fi
export PULL_TYPE=default export PULL_TYPE=default
install_initrd "confidential" install_initrd "confidential"
} }
@@ -610,7 +618,11 @@ install_kernel() {
} }
install_kernel_confidential() { install_kernel_confidential() {
export MEASURED_ROOTFS=yes if [ "${ARCH}" == "s390x" ]; then
export MEASURED_ROOTFS=no
else
export MEASURED_ROOTFS=yes
fi
install_kernel_helper \ install_kernel_helper \
"assets.kernel.confidential" \ "assets.kernel.confidential" \
@@ -850,6 +862,9 @@ install_shimv2() {
export GO_VERSION export GO_VERSION
export RUST_VERSION export RUST_VERSION
export MEASURED_ROOTFS export MEASURED_ROOTFS
if [ "${ARCH}" == "s390x" ]; then
export MEASURED_ROOTFS=no
fi
DESTDIR="${destdir}" PREFIX="${prefix}" "${shimv2_builder}" DESTDIR="${destdir}" PREFIX="${prefix}" "${shimv2_builder}"
} }