Improve Kind cleanup in CI (antrea-io#5738)

* Make sure that Antrea docker networks are deleted when garbage collecting clusters * Modify the Kind builder script for Jenkins CI to use `kind-setup.sh destroy` Signed-off-by: KMAnju-2021 <[email protected]>
tnqn · Nov 28, 2023 · b1fa272 · b1fa272
1 parent 54e4f85
commit b1fa272
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ci/jenkins/jobs/macros.yaml b/ci/jenkins/jobs/macros.yaml
@@ -246,7 +246,7 @@
           ./ci/jenkins/test.sh --testcase '{conformance_type}' --registry ${{DOCKER_REGISTRY}} --kubeconfig ${{PWD}}/.kube/config --testbed-type "kind" --kind-cluster-name "${{JOB_NAME}}-${{BUILD_NUMBER}}"
           return_code=$?
           set -ex
-          kind delete cluster --name "${{JOB_NAME}}-${{BUILD_NUMBER}}"
+          ./ci/kind/kind-setup.sh destroy "${{JOB_NAME}}-${{BUILD_NUMBER}}"
           exit $return_code
 
 - builder:

diff --git a/ci/kind/kind-setup.sh b/ci/kind/kind-setup.sh
@@ -383,8 +383,8 @@ function destroy {
       clean_kind
   else
       kind delete cluster --name $CLUSTER_NAME
-      delete_networks
   fi
+  delete_networks
 }
 
 function printUnixTimestamp {