github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-24 14:32:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #9403 from BbolroC/runtime-rs-ci-qemu

Browse Source 
CI: Enable GHA cri-containerd workflow for runtime-rs with QEMU
This commit is contained in:
Hyounggyu Choi 2024-04-15 09:31:25 +02:00 committed by GitHub
commit 32f58abfde
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/basic-ci-amd64.yaml vendored
View File

@ -22,7 +22,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
containerd_version: ['lts', 'active'] containerd_version: ['lts', 'active']
vmm: ['clh', 'dragonball', 'qemu', 'stratovirt', 'cloud-hypervisor'] vmm: ['clh', 'dragonball', 'qemu', 'stratovirt', 'cloud-hypervisor', 'qemu-runtime-rs']
runs-on: garm-ubuntu-2204-smaller runs-on: garm-ubuntu-2204-smaller
env: env:
CONTAINERD_VERSION: ${{ matrix.containerd_version }} CONTAINERD_VERSION: ${{ matrix.containerd_version }}

2
.github/workflows/run-cri-containerd-tests-s390x.yaml vendored
View File

@ -22,7 +22,7 @@ jobs:
fail-fast: false fail-fast: false
matrix: matrix:
containerd_version: ['active'] containerd_version: ['active']
vmm: ['qemu'] vmm: ['qemu', 'qemu-runtime-rs']
runs-on: s390x runs-on: s390x
env: env:
CONTAINERD_VERSION: ${{ matrix.containerd_version }} CONTAINERD_VERSION: ${{ matrix.containerd_version }}

2
src/runtime-rs/Makefile
View File

@ -249,7 +249,7 @@ endif
ifneq (,$(QEMUCMD)) ifneq (,$(QEMUCMD))
KNOWN_HYPERVISORS += $(HYPERVISOR_QEMU) KNOWN_HYPERVISORS += $(HYPERVISOR_QEMU)
CONFIG_FILE_QEMU = configuration-qemu.toml CONFIG_FILE_QEMU = configuration-qemu-runtime-rs.toml
CONFIG_QEMU = config/$(CONFIG_FILE_QEMU) CONFIG_QEMU = config/$(CONFIG_FILE_QEMU)
CONFIG_QEMU_IN = $(CONFIG_QEMU).in CONFIG_QEMU_IN = $(CONFIG_QEMU).in

0
src/runtime-rs/config/configuration-qemu.toml.in → src/runtime-rs/config/configuration-qemu-runtime-rs.toml.in
View File

2
tests/common.bash
View File

@ -450,7 +450,7 @@ function enabling_hypervisor() {
declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2" declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2"
case "${KATA_HYPERVISOR}" in case "${KATA_HYPERVISOR}" in
dragonball | cloud-hypervisor) dragonball|cloud-hypervisor|qemu-runtime-rs)
sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}" sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}"
declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers/runtime-rs" declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers/runtime-rs"
;; ;;

13
tests/integration/cri-containerd/integration-tests.sh
View File

@ -255,7 +255,12 @@ function TestContainerMemoryUpdate() {
DoContainerMemoryUpdate 0 DoContainerMemoryUpdate 0
fi fi
if [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then
# Remove TestContainerMemoryUpdate from passing_test
info "TestContainerMemoryUpdate skipped for qemu with runtime-rs"
info "Please check out https://github.com/kata-containers/kata-containers/issues/9375"
return
elif [[ "${KATA_HYPERVISOR}" != "qemu" ]] || [[ "${ARCH}" == "ppc64le" ]] || [[ "${ARCH}" == "s390x" ]]; then
return return
fi fi
@ -657,9 +662,15 @@ function main() {
TestContainerMemoryUpdate TestContainerMemoryUpdate
if [[ "${ARCH}" != "ppc64le" ]]; then if [[ "${ARCH}" != "ppc64le" ]]; then
if [[ "${KATA_HYPERVISOR}" == "qemu-runtime-rs" ]]; then
info "TestKilledVmmCleanup and TestDeviceCgroup skipped for qemu with runtime-rs"
info "Please check out https://github.com/kata-containers/kata-containers/issues/9375"
break
else
TestKilledVmmCleanup TestKilledVmmCleanup
TestDeviceCgroup TestDeviceCgroup
fi fi
fi
popd popd
} }