containerd: Skip using the CNI config provided by cri

The cni config used for tests from the cri repo has ipv6 routes. Skip this and use a cni config used for crio as well. Depends-on: github.com/kata-containers/runtime#2100 Fixes #2002 Signed-off-by: Archana Shinde <[email protected]>
kata-containers · Nov 5, 2019 · 2a09783 · 2a09783
1 parent 10b7b2b
commit 2a09783
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/.ci/install_cni_plugins.sh b/.ci/install_cni_plugins.sh
@@ -7,11 +7,6 @@
 
 set -e
 
-if [ "${CI_JOB}" == "CRI_CONTAINERD_K8S" ];then
-	echo "CRI_CONTAINERD_K8S: cri-o cni config will not be installed"
-	exit 0;
-fi
-
 cidir=$(dirname "$0")
 source "${cidir}/lib.sh"
 

diff --git a/integration/containerd/cri/integration-tests.sh b/integration/containerd/cri/integration-tests.sh
@@ -68,13 +68,6 @@ ci_config() {
 			sudo -E PATH=$PATH "$RUNTIME" factory init
 		fi
 	fi
-	if [ -n "${CI}" ]; then
-		(
-		echo "Install cni config for cri-containerd test"
-		cd "${GOPATH}/src/${cri_containerd_repo}"
-		./hack/install/install-cni-config.sh
-		)
-	fi
 }
 
 ci_cleanup() {