From 45036656e40876c8c2b293a0d424369a6457e6b0 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@microsoft.com>
Date: Mon, 21 May 2018 19:53:41 -0400
Subject: [PATCH] remove flannel/containerd e2e config since it is passed in
 jenkins already

Signed-off-by: Jess Frazelle <acidburn@microsoft.com>
---
 .../kubernetes-config/containerd.json         | 40 -------------------
 .../kubernetes/kubernetes-config/flannel.json | 39 ------------------
 parts/k8s/kubernetescustomscript.sh           |  4 +-
 3 files changed, 3 insertions(+), 80 deletions(-)
 delete mode 100644 examples/e2e-tests/kubernetes/kubernetes-config/containerd.json
 delete mode 100644 examples/e2e-tests/kubernetes/kubernetes-config/flannel.json

diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/containerd.json b/examples/e2e-tests/kubernetes/kubernetes-config/containerd.json
deleted file mode 100644
index facad5df83..0000000000
--- a/examples/e2e-tests/kubernetes/kubernetes-config/containerd.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  "apiVersion": "vlabs",
-  "properties": {
-    "orchestratorProfile": {
-      "orchestratorType": "Kubernetes",
-      "orchestratorRelease": "1.10",
-      "kubernetesConfig": {
-        "networkPlugin": "flannel",
-        "containerRuntime": "containerd"
-      }
-    },
-    "masterProfile": {
-      "count": 1,
-      "dnsPrefix": "",
-      "vmSize": "Standard_D2_v2"
-    },
-    "agentPoolProfiles": [
-      {
-        "name": "agentpool1",
-        "count": 3,
-        "vmSize": "Standard_D2_v2",
-        "availabilityProfile": "AvailabilitySet"
-      }
-    ],
-    "linuxProfile": {
-      "adminUsername": "azureuser",
-      "ssh": {
-        "publicKeys": [
-          {
-            "keyData": ""
-          }
-        ]
-      }
-    },
-    "servicePrincipalProfile": {
-      "clientId": "",
-      "secret": ""
-    }
-  }
-}
diff --git a/examples/e2e-tests/kubernetes/kubernetes-config/flannel.json b/examples/e2e-tests/kubernetes/kubernetes-config/flannel.json
deleted file mode 100644
index d015d34c53..0000000000
--- a/examples/e2e-tests/kubernetes/kubernetes-config/flannel.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "apiVersion": "vlabs",
-  "properties": {
-    "orchestratorProfile": {
-      "orchestratorType": "Kubernetes",
-      "kubernetesConfig": {
-        "networkPlugin":"flannel",
-      }
-    },
-    "masterProfile": {
-      "count": 1,
-      "dnsPrefix": "",
-      "vmSize": "Standard_D2_v2"
-    },
-    "agentPoolProfiles": [
-      {
-        "name": "linuxpool1",
-        "count": 3,
-        "vmSize": "Standard_D2_v2",
-        "availabilityProfile": "AvailabilitySet"
-      }
-    ],
-    "linuxProfile": {
-      "adminUsername": "azureuser",
-      "ssh": {
-        "publicKeys": [
-          {
-            "keyData": ""
-          }
-        ]
-      }
-    },
-    "servicePrincipalProfile": {
-      "clientId": "",
-      "secret": ""
-    },
-    "certificateProfile": {}
-  }
-}
diff --git a/parts/k8s/kubernetescustomscript.sh b/parts/k8s/kubernetescustomscript.sh
index 9a00e54ae3..6e7ed60f73 100644
--- 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() {