mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-08-21 01:13:56 +00:00
CI: enable test container memory update for dragonball
Fixes: #8746 Signed-off-by: alex.lyn <alex.lyn@antgroup.com>
This commit is contained in:
parent
6c85e95c34
commit
b97efc3139
@ -246,10 +246,26 @@ function TestKilledVmmCleanup() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function TestContainerMemoryUpdate() {
|
function TestContainerMemoryUpdate() {
|
||||||
|
# there's no need to set true for enable_virtio_mem in dragonball
|
||||||
|
# As it can support virtio-mem by default.
|
||||||
|
if [[ "${KATA_HYPERVISOR}" == "dragonball" ]]; then
|
||||||
|
# Currently, dragonball fails at decrease memory, just test increasing memory.
|
||||||
|
# We'll re-enable it as soon as we get it to work.
|
||||||
|
# Reference: https://github.com/kata-containers/kata-containers/issues/8804
|
||||||
|
DoContainerMemoryUpdate 0
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
|
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
for virtio_mem_enabled in {1, 0}; do
|
||||||
|
PrepareContainerMemoryUpdate $virtio_mem_enabled
|
||||||
|
DoContainerMemoryUpdate $virtio_mem_enabled
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
function PrepareContainerMemoryUpdate() {
|
||||||
test_virtio_mem=$1
|
test_virtio_mem=$1
|
||||||
|
|
||||||
if [ $test_virtio_mem -eq 1 ]; then
|
if [ $test_virtio_mem -eq 1 ]; then
|
||||||
@ -264,7 +280,12 @@ function TestContainerMemoryUpdate() {
|
|||||||
|
|
||||||
sudo sed -i -e 's/^enable_virtio_mem.*$/#enable_virtio_mem = true/g' "${kata_config}"
|
sudo sed -i -e 's/^enable_virtio_mem.*$/#enable_virtio_mem = true/g' "${kata_config}"
|
||||||
fi
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function DoContainerMemoryUpdate() {
|
||||||
|
descrease_memory=$1
|
||||||
|
|
||||||
|
# start a test container
|
||||||
testContainerStart
|
testContainerStart
|
||||||
|
|
||||||
vm_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024))
|
vm_size=$(($(sudo crictl exec $cid cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')*1024))
|
||||||
@ -282,7 +303,7 @@ function TestContainerMemoryUpdate() {
|
|||||||
die "The VM memory size $vm_size after increase is not right"
|
die "The VM memory size $vm_size after increase is not right"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $test_virtio_mem -eq 1 ]; then
|
if [ $descrease_memory -eq 1 ]; then
|
||||||
sudo crictl update --memory $((1*1024*1024*1024)) $cid
|
sudo crictl update --memory $((1*1024*1024*1024)) $cid
|
||||||
sleep 1
|
sleep 1
|
||||||
|
|
||||||
@ -293,6 +314,7 @@ function TestContainerMemoryUpdate() {
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# stop the test container
|
||||||
testContainerStop
|
testContainerStop
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -632,11 +654,7 @@ function main() {
|
|||||||
# Reference: https://github.com/kata-containers/kata-containers/issues/7410
|
# Reference: https://github.com/kata-containers/kata-containers/issues/7410
|
||||||
# TestContainerSwap
|
# TestContainerSwap
|
||||||
|
|
||||||
# TODO: runtime-rs doesn't support memory update currently
|
TestContainerMemoryUpdate
|
||||||
if [ "$KATA_HYPERVISOR" != "dragonball" ]; then
|
|
||||||
TestContainerMemoryUpdate 1
|
|
||||||
TestContainerMemoryUpdate 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ "${ARCH}" != "ppc64le" ]]; then
|
if [[ "${ARCH}" != "ppc64le" ]]; then
|
||||||
TestKilledVmmCleanup
|
TestKilledVmmCleanup
|
||||||
|
Loading…
Reference in New Issue
Block a user