From 242702c2131ba51041bd9bd64853c7d9887b1bd5 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dcallagh@redhat.com>
Date: Jun 13 2017 06:02:47 +0000
Subject: Jenkinsfile: don't delete pods during teardown


The pods will be automatically deleted by OpenShift when we delete the
associated deployment. If we try to explicitly delete the pods
ourselves, it will occasionally fail due to a race condition (we try to
delete the pod but it's already gone):

    ERROR: Error during delete;
    {reference={}, err=Error from server (NotFound): pods "waiverdb-test-jenkins-waiverdb-49-web-1-jqs0a" not found, verb=delete, cmd=oc delete dc,deploy,pod,configmap,secret,svc,route -l environment=test-jenkins-waiverdb-49 --server=https://open.paas.redhat.com/ --namespace=waiverdb-test --token=XXXXX , out=deploymentconfig "waiverdb-test-jenkins-waiverdb-49-database" deleted
    deploymentconfig "waiverdb-test-jenkins-waiverdb-49-web" deleted
    pod "waiverdb-test-jenkins-waiverdb-49-database-1-x6dka" deleted
    pod "waiverdb-test-jenkins-waiverdb-49-web-1-raf5x" deleted
    configmap "waiverdb-test-jenkins-waiverdb-49-configmap" deleted
    secret "waiverdb-test-jenkins-waiverdb-49-secret" deleted
    service "waiverdb-test-jenkins-waiverdb-49-database" deleted
    service "waiverdb-test-jenkins-waiverdb-49-web" deleted
    route "waiverdb-test-jenkins-waiverdb-49-web" deleted, status=1}

---

diff --git a/Jenkinsfile b/Jenkinsfile
index 536bf2d..38e2908 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -148,7 +148,7 @@ node('fedora') {
                         }
                     } finally {
                         /* Tear down everything we just created */
-                        openshift.selector('dc,deploy,pod,configmap,secret,svc,route',
+                        openshift.selector('dc,deploy,configmap,secret,svc,route',
                                 ['environment': environment_label]).delete()
                     }
                 }