github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-04-26 10:32:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #12695 from microsoft/saulparedes/test_mariner_runtime-rs

Browse Source 
ci: k8s-tests: test mariner and runtime-rs
This commit is contained in:
Aurélien Bombo
2026-04-22 16:01:08 -05:00
committed by GitHub
parent 8dccf4cf37 cafdd278ba
commit 87a3318151
4 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/run-k8s-tests-on-aks.yaml vendored
View File

@@ -54,6 +54,12 @@ jobs:
- host_os: cbl-mariner
vmm: clh
instance-type: normal
- host_os: cbl-mariner
vmm: cloud-hypervisor
instance-type: small
- host_os: cbl-mariner
vmm: cloud-hypervisor
instance-type: normal
runs-on: ubuntu-22.04
permissions:
contents: read

4
tests/integration/kubernetes/gha-run.sh
View File

@@ -450,7 +450,9 @@ function main() {
# Auto-generate policy on some Host types, if the caller didn't specify an AUTO_GENERATE_POLICY value.
if [[ -z "${AUTO_GENERATE_POLICY}" ]]; then
if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then
# https://github.com/kata-containers/kata-containers/issues/12839
if [[ "${KATA_HOST_OS}" = "cbl-mariner" && \
"${KATA_HYPERVISOR}" = "clh" ]]; then
AUTO_GENERATE_POLICY="yes"
elif [[ "${KATA_HYPERVISOR}" = qemu-coco-dev* && \
( "${TARGET_ARCH}" = "x86_64" || "${TARGET_ARCH}" = "aarch64" ) && \

6
tests/integration/kubernetes/tests_common.sh
View File

@@ -127,7 +127,7 @@ get_kubelet_data_dir() {
}
is_runtime_rs() {
[[ "${KATA_HYPERVISOR}" == *-runtime-rs ]]
[[ "${KATA_HYPERVISOR}" == *-runtime-rs || "${KATA_HYPERVISOR}" == "cloud-hypervisor" ]]
}
# Copy the right combination of drop-ins from drop-in-examples/ into
@@ -352,7 +352,9 @@ hard_coded_policy_tests_enabled() {
fi
done
if [[ "${enabled}" == "no" && "${KATA_HOST_OS}" == "cbl-mariner" ]]; then
# https://github.com/kata-containers/kata-containers/issues/12720
if [[ "${enabled}" == "no" && "${KATA_HOST_OS}" == "cbl-mariner" && \
"${KATA_HYPERVISOR}" == "clh" ]]; then
enabled="yes"
fi

2
tools/testing/gatekeeper/required-tests.yaml
View File

@@ -80,6 +80,8 @@ mapping:
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, normal)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, small, containerd)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, small, oci-distribution)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, cloud-hypervisor, small)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, cloud-hypervisor, normal)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh, lts)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh, active)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (dragonball, lts)