From 6d0cb1e9a82f365bfc7a63b4e5dc959fee86b7d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Rop=C3=A9?= Date: Wed, 6 Nov 2024 11:26:21 +0100 Subject: [PATCH] ci: export CONTAINER_RUNTIME to the test scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This variable will allow tests to adapt their behaviour to the runtime (containerd/crio). Signed-off-by: Julien Ropé --- .github/workflows/run-k8s-tests-on-amd64.yaml | 1 + tests/integration/kubernetes/gha-run.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/run-k8s-tests-on-amd64.yaml b/.github/workflows/run-k8s-tests-on-amd64.yaml index 338e923f29..66fe6b73d8 100644 --- a/.github/workflows/run-k8s-tests-on-amd64.yaml +++ b/.github/workflows/run-k8s-tests-on-amd64.yaml @@ -56,6 +56,7 @@ jobs: SNAPSHOTTER: ${{ matrix.snapshotter }} USING_NFD: "false" K8S_TEST_HOST_TYPE: all + CONTAINER_RUNTIME: ${{ matrix.container_runtime }} steps: - uses: actions/checkout@v4 with: diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 62faae2cab..8d2e998add 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -26,6 +26,7 @@ DOCKER_TAG=${DOCKER_TAG:-kata-containers-latest} KATA_DEPLOY_WAIT_TIMEOUT=${KATA_DEPLOY_WAIT_TIMEOUT:-600} SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT=${SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT:-8m} KATA_HYPERVISOR=${KATA_HYPERVISOR:-qemu} +CONTAINER_RUNTIME=${CONTAINER_RUNTIME:-containerd} KBS=${KBS:-false} KBS_INGRESS=${KBS_INGRESS:-} KUBERNETES="${KUBERNETES:-}"