Merge pull request kata-containers#8570 from fidencio/topic/gha-drago…

…nball-enable-some-tests-but-do-not-run-them-yet gha: dragonball: Enable, but do not run, cri-containerd, stability, and devmapper tests
Amulyam24 · Dec 5, 2023 · f75f17c · f75f17c
2 parents e2c6b8a + 05ce52d
commit f75f17c
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 3 deletions.
diff --git 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 }}
@@ -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/.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/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
 }
 

diff --git 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
 }
 

diff --git 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"