Skip to content
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

Jump to bottom

Bug 1841315: reenable jenkins e2e in e2e-gcp-builds #25033

Merged
merged 1 commit into from
May 30, 2020
Merged

Bug 1841315: reenable jenkins e2e in e2e-gcp-builds #25033

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 8 additions & 12 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 @@ -15,6 +15,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/validation"
"k8s.io/apimachinery/pkg/util/wait"
e2e "k8s.io/kubernetes/test/e2e/framework"
"k8s.io/kubernetes/test/e2e/framework/pod"
e2epv "k8s.io/kubernetes/test/e2e/framework/pv"

Expand Down Expand Up @@ -166,9 +167,10 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
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 @@ -215,7 +217,6 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
g.Context("jenkins-client-plugin tests", func() {

g.It("using the ephemeral template", func() {
g.Skip("disabling Jenkins until https://bugzilla.redhat.com/show_bug.cgi?id=1783530 sorted out")
defer cleanup(jenkinsEphemeralTemplatePath)
setupJenkins(jenkinsEphemeralTemplatePath)

Expand Down Expand Up @@ -248,15 +249,9 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
}

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 @@ -271,7 +266,9 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
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()
gabemontero marked this conversation as resolved.
Show resolved Hide resolved
o.Expect(err).NotTo(o.HaveOccurred())
})

Expand Down Expand Up @@ -382,7 +379,6 @@ var _ = g.Describe("[sig-builds][Feature:Builds][sig-devex][Feature:Jenkins][Slo
g.Context("Sync plugin tests", func() {

g.It("using the ephemeral template", func() {
g.Skip("disabling Jenkins until https://bugzilla.redhat.com/show_bug.cgi?id=1783530 sorted out")
defer cleanup(jenkinsEphemeralTemplatePath)
setupJenkins(jenkinsEphemeralTemplatePath)

Expand Down