Skip to content

[release-4.3] [release-4.4] Bug 1848976: reenable jenkins e2e in e2e-gcp-builds #25171

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 22, 2020
Merged

[release-4.3] [release-4.4] Bug 1848976: reenable jenkins e2e in e2e-gcp-builds #25171

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions test/extended/builds/pipeline_origin_bld.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}

Expand Down Expand Up @@ -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:
Expand All @@ -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())
})

Expand Down