From 3aff6c5bd803f0de7355d194b04214a01aa13ca1 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Tue, 4 Jun 2024 15:41:15 +0200 Subject: [PATCH 1/2] CI: Retry fetching node_start_time when it is empty It was observed that the `node_start_time` value is sometimes empty, leading to a test failure. This commit retries fetching the value up to 3 times. Signed-off-by: Hyounggyu Choi --- tests/integration/kubernetes/tests_common.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 88ddf9c1a..6541ffe99 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -48,6 +48,14 @@ setup_common() { node=$(get_one_kata_node) [ -n "$node" ] node_start_time=$(exec_host "$node" date +\"%Y-%m-%d %H:%M:%S\") + # If node_start_time is empty, try again 3 times with a 5 seconds sleep between each try. + count=0 + while [ -z "$node_start_time" ] && [ $count -lt 3 ]; do + echo "node_start_time is empty, trying again..." + sleep 5 + node_start_time=$(exec_host "$node" date +\"%Y-%m-%d %H:%M:%S\") + count=$((count + 1)) + done [ -n "$node_start_time" ] export node node_start_time From 246ee83768549cc0be4a706482ac8b48c359cb50 Mon Sep 17 00:00:00 2001 From: Hyounggyu Choi Date: Tue, 4 Jun 2024 15:49:23 +0200 Subject: [PATCH 2/2] GHA: Use qemu-coco-dev for k8s nydus test on s390x In line with the changes for x86_64, the k8s nydus test for s390x should also use `qemu-coco-dev` for `KATA_HYPERVISOR`. Signed-off-by: Hyounggyu Choi --- .github/workflows/run-k8s-tests-on-zvsi.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/run-k8s-tests-on-zvsi.yaml b/.github/workflows/run-k8s-tests-on-zvsi.yaml index 1083f0a76..d6725b9d8 100644 --- a/.github/workflows/run-k8s-tests-on-zvsi.yaml +++ b/.github/workflows/run-k8s-tests-on-zvsi.yaml @@ -27,8 +27,6 @@ jobs: strategy: fail-fast: false matrix: - vmm: - - qemu snapshotter: - devmapper - nydus @@ -39,10 +37,12 @@ jobs: pull-type: default using-nfd: true deploy-cmd: configure-snapshotter + vmm: qemu - snapshotter: nydus pull-type: guest-pull using-nfd: false deploy-cmd: deploy-snapshotter + vmm: qemu-coco-dev runs-on: s390x-large env: DOCKER_REGISTRY: ${{ inputs.registry }}