From 2bad0ae2d02313f0a51a87b5f3a714c4b7744086 Mon Sep 17 00:00:00 2001 From: gabemontero Date: Wed, 27 May 2020 09:24:04 -0400 Subject: [PATCH] reenable jenkins e2e in e2e-gcp-builds; update client plugin cleanup; minor debug changes --- test/extended/builds/pipeline_origin_bld.go | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/test/extended/builds/pipeline_origin_bld.go b/test/extended/builds/pipeline_origin_bld.go index 6ed4e297bf19..32b52ae3f67a 100644 --- a/test/extended/builds/pipeline_origin_bld.go +++ b/test/extended/builds/pipeline_origin_bld.go @@ -165,9 +165,10 @@ var _ = g.Describe("[Feature:Builds][Feature:Jenkins][Slow] openshift pipeline b j = jenkins.NewRef(oc) g.By("wait for jenkins to come up") - _, err = j.WaitForContent("", 200, 10*time.Minute, "") + resp, err := j.WaitForContent("", 200, 5*time.Minute, "") if err != nil { + e2e.Logf("wait for jenkins to come up got err and resp string %s and err %s, dumping pods", resp, err.Error()) exutil.DumpApplicationPodLogs("jenkins", oc) } @@ -246,15 +247,9 @@ var _ = g.Describe("[Feature:Builds][Feature:Jenkins][Slow] openshift pipeline b } g.By("clean up openshift resources for next potential run") - err = oc.Run("delete").Args("bc", "sample-pipeline-openshift-client-plugin").Execute() + err = oc.Run("delete").Args("bc", "--all").Execute() o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.Run("delete").Args("dc", "jenkins-second-deployment").Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.Run("delete").Args("bc", "ruby").Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.Run("delete").Args("is", "ruby").Execute() - o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.Run("delete").Args("is", "ruby-25-centos7").Execute() + err = oc.Run("delete").Args("is", "--all").Execute() o.Expect(err).NotTo(o.HaveOccurred()) // doing this as admin to avoid errors like this: @@ -269,7 +264,9 @@ var _ = g.Describe("[Feature:Builds][Feature:Jenkins][Slow] openshift pipeline b o.Expect(err).NotTo(o.HaveOccurred()) err = oc.Run("delete").Args("template", "mongodb-ephemeral").Execute() o.Expect(err).NotTo(o.HaveOccurred()) - err = oc.Run("delete").Args("secret", "mongodb").Execute() + err = oc.Run("delete").Args("secret", "mongodb", "--ignore-not-found=true").Execute() + o.Expect(err).NotTo(o.HaveOccurred()) + err = oc.Run("delete").Args("service", "mongodb", "--ignore-not-found=true").Execute() o.Expect(err).NotTo(o.HaveOccurred()) })