From 8ab3894dc518ae3230e9aa2518c5b1294a2fe31e Mon Sep 17 00:00:00 2001 From: ChengyuZhu6 Date: Wed, 21 Feb 2024 19:43:36 +0800 Subject: [PATCH] gha: try to cleanup nydus snapshotter before deploying it MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit CI failed to deploy nydus snapshotter because it was not cleaned up last time. So we can try to cleanup nydus snapshotter before deploying it. Fixes: #9121 Signed-off-by: ChengyuZhu6 Co-authored-by: Fabiano Fidêncio --- tests/integration/kubernetes/gha-run.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 8263f0c937..b9e5ca404c 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -21,7 +21,7 @@ DOCKER_REGISTRY=${DOCKER_REGISTRY:-quay.io} DOCKER_REPO=${DOCKER_REPO:-kata-containers/kata-deploy-ci} DOCKER_TAG=${DOCKER_TAG:-kata-containers-latest} KATA_DEPLOY_WAIT_TIMEOUT=${KATA_DEPLOY_WAIT_TIMEOUT:-10m} -SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT=${SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT:-5m} +SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT=${SNAPSHOTTER_DEPLOY_WAIT_TIMEOUT:-8m} KATA_HYPERVISOR=${KATA_HYPERVISOR:-qemu} KUBERNETES="${KUBERNETES:-}" SNAPSHOTTER="${SNAPSHOTTER:-}" @@ -284,6 +284,7 @@ function deploy_nydus_snapshotter() { git clone -b "${nydus_snapshotter_version}" "${nydus_snapshotter_url}" "${nydus_snapshotter_install_dir}" pushd "$nydus_snapshotter_install_dir" + cleanup_nydus_snapshotter || true if [ "${PULL_TYPE}" == "guest-pull" ]; then # Enable guest pull feature in nydus snapshotter yq write -i misc/snapshotter/base/nydus-snapshotter.yaml 'data.FS_DRIVER' "proxy" --style=double @@ -334,10 +335,9 @@ function cleanup_nydus_snapshotter() { fi sleep 180s kubectl delete -f "misc/snapshotter/nydus-snapshotter-rbac.yaml" + kubectl get ns nydus-system -o json | jq '.spec.finalizers = []' | kubectl replace --raw "/api/v1/namespaces/nydus-system/finalize" -f || true popd sleep 30s - - rm -rf "${nydus_snapshotter_install_dir}" echo "::endgroup::" }