remove flannel/containerd e2e config since it is passed in jenkins al…

…ready Signed-off-by: Jess Frazelle <[email protected]>
Azure · May 22, 2018 · 4503665 · 4503665
1 parent 44df46f
commit 4503665
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 80 deletions.
diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/containerd.json b/examples/e2e-tests/kubernetes/kubernetes-config/containerd.json
diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/flannel.json b/examples/e2e-tests/kubernetes/kubernetes-config/flannel.json
diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh
@@ -293,7 +293,9 @@ function installContainerd() {
 	rm -f "$CONTAINERD_TGZ_TMP"
 
 	echo "Successfully installed cri-containerd..."
-	setupContainerd
+	if [[ "$CONTAINER_RUNTIME" == "clear-containers" ]] || [[ "$CONTAINER_RUNTIME" == "containerd" ]]; then
+		setupContainerd
+	fi
 }
 
 function setupContainerd() {