From 16ad721eda22967779521c6f4ed13f498e11a8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 5 Dec 2023 09:34:51 +0100 Subject: [PATCH 1/3] cri-containerd: dragonball: Enable, but do not run, the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make the life easier for dragonball developers to properly enable the tests once the tests are ready. Signed-off-by: Fabiano Fidêncio --- .github/workflows/basic-ci-amd64.yaml | 2 +- tests/integration/cri-containerd/gha-run.sh | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index a4f96c096d..abcbb40e15 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -22,7 +22,7 @@ jobs: fail-fast: false matrix: containerd_version: ['lts', 'active'] - vmm: ['clh', 'qemu', 'stratovirt'] + vmm: ['clh', 'dragonball', 'qemu', 'stratovirt'] runs-on: garm-ubuntu-2204-smaller env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} diff --git a/tests/integration/cri-containerd/gha-run.sh b/tests/integration/cri-containerd/gha-run.sh index 6181deede7..09ffc4fedf 100755 --- a/tests/integration/cri-containerd/gha-run.sh +++ b/tests/integration/cri-containerd/gha-run.sh @@ -60,6 +60,12 @@ function run() { info "Running cri-containerd tests using ${KATA_HYPERVISOR} hypervisor" enabling_hypervisor + + if [ "${KATA_HYPERVISOR}" = "dragonball" ]; then + echo "Skipping test for ${KATA_HYPERVISOR}" + return 0 + fi + bash -c ${cri_containerd_dir}/integration-tests.sh } From a8a156b1af6e6cc1b25ee5244614a29af3e4ebef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 5 Dec 2023 09:36:04 +0100 Subject: [PATCH 2/3] stability: dragonball: Enable, but do not run, the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make the life easier for dragonball developers to properly enable the tests once the tests are ready. Signed-off-by: Fabiano Fidêncio --- .github/workflows/basic-ci-amd64.yaml | 2 +- tests/stability/gha-run.sh | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index abcbb40e15..5b12a78e4d 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -60,7 +60,7 @@ jobs: fail-fast: false matrix: containerd_version: ['lts', 'active'] - vmm: ['clh', 'cloud-hypervisor', 'qemu', 'stratovirt'] + vmm: ['clh', 'cloud-hypervisor', 'dragonball', 'qemu', 'stratovirt'] runs-on: garm-ubuntu-2204-smaller env: CONTAINERD_VERSION: ${{ matrix.containerd_version }} diff --git a/tests/stability/gha-run.sh b/tests/stability/gha-run.sh index 23e495e444..6db0ffe529 100755 --- a/tests/stability/gha-run.sh +++ b/tests/stability/gha-run.sh @@ -32,6 +32,11 @@ function install_dependencies() { function run() { info "Running soak parallel stability tests using ${KATA_HYPERVISOR} hypervisor" + if [ "${KATA_HYPERVISOR}" = "dragonball" ]; then + echo "Skipping test for ${KATA_HYPERVISOR}" + return 0 + fi + export ITERATIONS=2 MAX_CONTAINERS=20 bash "${stability_dir}/soak_parallel_rm.sh" From 05ce52d746d642f10b32db1661e82e86840438ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 5 Dec 2023 09:36:34 +0100 Subject: [PATCH 3/3] devmapper: dragonball: Enable, but do not run, the tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will make the life easier for dragonball developers to properly enable the tests once the tests are ready. Fixes: #8569 Signed-off-by: Fabiano Fidêncio --- .github/workflows/run-k8s-tests-on-garm.yaml | 1 + tests/integration/kubernetes/gha-run.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run-k8s-tests-on-garm.yaml b/.github/workflows/run-k8s-tests-on-garm.yaml index 622708e585..66e135f5b1 100644 --- a/.github/workflows/run-k8s-tests-on-garm.yaml +++ b/.github/workflows/run-k8s-tests-on-garm.yaml @@ -29,6 +29,7 @@ jobs: matrix: vmm: - clh #cloud-hypervisor + - dragonball - fc #firecracker - qemu snapshotter: diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index d215ea47fb..5910013c69 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -19,6 +19,7 @@ DOCKER_TAG=${DOCKER_TAG:-kata-containers-latest} KATA_DEPLOY_WAIT_TIMEOUT=${KATA_DEPLOY_WAIT_TIMEOUT:-10m} KATA_HYPERVISOR=${KATA_HYPERVISOR:-qemu} KUBERNETES="${KUBERNETES:-}" +SNAPSHOTTER="${SNAPSHOTTER:-}" function configure_devmapper() { sudo mkdir -p /var/lib/containerd/devmapper @@ -172,7 +173,11 @@ function run_tests() { pushd "${kubernetes_dir}" bash setup.sh - bash run_kubernetes_tests.sh + if [[ "${KATA_HYPERVISOR}" = "dragonball" ]] && [[ "${SNAPSHOTTER}" = "devmapper" ]]; then + echo "Skipping tests for dragonball using devmapper" + else + bash run_kubernetes_tests.sh + fi popd }