commit 736f6b859b3668fc59be701dfda24e06e79efe36
author Matteo Scandolo <teo@opennetworking.org> Thu Jan 24 15:29:07 2019 -0800
committer Luca Prete <luca@opennetworking.org> Fri Jan 25 21:32:49 2019 +0000
tree 7282c63eaba0b899ade125ad5d9dc0be39ae4def
parent c8328eb775a9e5448166606460b2a0beb301ee62

Excluding test pods from cleanup script in MCORD pipeline

Change-Id: I2b4791b6d05f774a321da1a4e1b5287765249d94

Jenkinsfile-mcord-local-build

diff --git a/Jenkinsfile-mcord-local-build b/Jenkinsfile-mcord-local-build
index 5609414..4d910a9 100644
--- a/Jenkinsfile-mcord-local-build
+++ b/Jenkinsfile-mcord-local-build
@@ -46,11 +46,11 @@
                             stage("Cleanup SR-IOV CNI and SR-IOV Network Device Plugin") {
                                 sh returnStdout: true, script: """
                                 export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf
-                                kubectl delete -f mcord/cni-config/05-sriov-device-plugin.yaml
-                                kubectl delete -f mcord/cni-config/04-sriov-device-plugin-configmap.yaml
-                                kubectl delete -f mcord/cni-config/03-network-definition.yaml
-                                kubectl delete -f mcord/cni-config/02-network-crd.yaml
-                                kubectl delete -f mcord/cni-config/01-cni-service-account.yaml
+                                kubectl delete -f mcord/cni-config/05-sriov-device-plugin.yaml || true
+                                kubectl delete -f mcord/cni-config/04-sriov-device-plugin-configmap.yaml || true
+                                kubectl delete -f mcord/cni-config/03-network-definition.yaml || true
+                                kubectl delete -f mcord/cni-config/02-network-crd.yaml || true
+                                kubectl delete -f mcord/cni-config/01-cni-service-account.yaml || true
                                 """
                             }
                         }
@@ -59,7 +59,7 @@
                         waitUntil {
                             kubectl_deleted = sh returnStdout: true, script: """
                             export KUBECONFIG=$WORKSPACE/${configBaseDir}/${configKubernetesDir}/${configFileName}.conf &&
-                            kubectl get pods --all-namespaces --no-headers | grep -E -v 'kube-system|docker-registry|mavenrepo|ponnet' | wc -l
+                            kubectl get pods --all-namespaces --no-headers | grep -E -v 'kube-system|docker-registry|mavenrepo|ponnet|test' | wc -l
                             """
                             return kubectl_deleted.toInteger() == 0
                         }