Skip to content

Commit 7f170dc

Browse files
author
OpenShift Bot
committed
Merge pull request #8911 from gabemontero/imgExtDeployPain
Merged by openshift-bot
2 parents b952a9e + 2827050 commit 7f170dc

15 files changed

+198
-75
lines changed

‎test/extended/images/mongodb_ephemeral.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,12 @@ var _ = g.Describe("[images][mongodb] openshift mongodb image", func() {
2121
g.Describe("creating from a template", func() {
2222
g.It(fmt.Sprintf("should process and create the %q template", templatePath), func() {
2323

24+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
2425
g.By("creating a new app")
2526
o.Expect(oc.Run("new-app").Args("-f", templatePath).Execute()).Should(o.Succeed())
2627

2728
g.By("waiting for the deployment to complete")
28-
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "mongodb")
29-
if err != nil {
30-
exutil.DumpDeploymentLogs("mongodb", oc)
31-
}
29+
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "mongodb", oc)
3230
o.Expect(err).ShouldNot(o.HaveOccurred())
3331

3432
g.By("expecting the mongodb pod is running")

‎test/extended/images/mongodb_replica.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,12 @@ var _ = g.Describe("[images][mongodb] openshift mongodb replication", func() {
3232
g.Describe("creating from a template", func() {
3333
g.It(fmt.Sprintf("should process and create the %q template", templatePath), func() {
3434

35+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
3536
g.By("creating a new app")
3637
o.Expect(oc.Run("new-app").Args("-f", templatePath).Execute()).Should(o.Succeed())
3738

3839
g.By("waiting for the deployment to complete")
39-
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), deploymentConfigName)
40-
if err != nil {
41-
exutil.DumpDeploymentLogs(deploymentConfigName, oc)
42-
}
40+
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), deploymentConfigName, oc)
4341
o.Expect(err).NotTo(o.HaveOccurred())
4442

4543
podNames := waitForNumberOfPodsWithLabel(oc, expectedReplicasAfterDeployment, "mongodb-replica")

‎test/extended/images/mysql_ephemeral.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ var _ = g.Describe("[images][mysql][Slow] openshift mysql image", func() {
2929

3030
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
3131
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
32-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "mysql")
33-
if err != nil {
34-
exutil.DumpDeploymentLogs("mysql", oc)
35-
}
32+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "mysql", oc)
3633
o.Expect(err).NotTo(o.HaveOccurred())
3734

3835
g.By("expecting the mysql service get endpoints")

‎test/extended/images/mysql_replica.go

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ func CreateMySQLReplicationHelpers(c kclient.PodInterface, masterDeployment, sla
6868
}
6969

7070
func cleanup(oc *exutil.CLI) {
71+
exutil.DumpImageStreams(oc)
7172
oc.AsAdmin().Run("delete").Args("all", "--all", "-n", oc.Namespace()).Execute()
73+
exutil.DumpImageStreams(oc)
7274
oc.AsAdmin().Run("delete").Args("pvc", "--all", "-n", oc.Namespace()).Execute()
7375
exutil.CleanupHostPathVolumes(oc.AdminKubeREST().PersistentVolumes(), oc.Namespace())
7476
}
@@ -84,6 +86,7 @@ func replicationTestFactory(oc *exutil.CLI, tc testCase) func() {
8486
err = testutil.WaitForPolicyUpdate(oc.REST(), oc.Namespace(), "create", templateapi.Resource("templates"), true)
8587
o.Expect(err).NotTo(o.HaveOccurred())
8688

89+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
8790
err = oc.Run("new-app").Args("-f", tc.TemplatePath).Execute()
8891
o.Expect(err).NotTo(o.HaveOccurred())
8992

@@ -92,12 +95,11 @@ func replicationTestFactory(oc *exutil.CLI, tc testCase) func() {
9295

9396
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
9497
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
95-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), helperName)
96-
if err != nil {
97-
exutil.DumpDeploymentLogs(helperName, oc)
98-
}
98+
g.By("waiting for the deployment to complete")
99+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), helperName, oc)
99100
o.Expect(err).NotTo(o.HaveOccurred())
100101

102+
g.By("waiting for an endpoint")
101103
err = oc.KubeFramework().WaitForAnEndpoint(helperName)
102104
o.Expect(err).NotTo(o.HaveOccurred())
103105

@@ -106,16 +108,19 @@ func replicationTestFactory(oc *exutil.CLI, tc testCase) func() {
106108
tableCounter++
107109
table := fmt.Sprintf("table_%0.2d", tableCounter)
108110

111+
g.By("creating replication helpers")
109112
master, slaves, helper := CreateMySQLReplicationHelpers(oc.KubeREST().Pods(oc.Namespace()), masterDeployment, slaveDeployment, fmt.Sprintf("%s-1", helperName), slaveCount)
110113
o.Expect(exutil.WaitUntilAllHelpersAreUp(oc, []exutil.Database{master, helper})).NotTo(o.HaveOccurred())
111114
o.Expect(exutil.WaitUntilAllHelpersAreUp(oc, slaves)).NotTo(o.HaveOccurred())
112115

113116
// Test if we can query as root
117+
g.By("wait for mysql-master endpoint")
114118
oc.KubeFramework().WaitForAnEndpoint("mysql-master")
115119
err := helper.TestRemoteLogin(oc, "mysql-master")
116120
o.Expect(err).NotTo(o.HaveOccurred())
117121

118122
// Create a new table with random name
123+
g.By("create new table")
119124
_, err = master.Query(oc, fmt.Sprintf("CREATE TABLE %s (col1 VARCHAR(20), col2 VARCHAR(20));", table))
120125
o.Expect(err).NotTo(o.HaveOccurred())
121126

‎test/extended/images/postgresql_replica.go

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ func PostgreSQLReplicationTestFactory(oc *exutil.CLI, image string) func() {
7676
err = testutil.WaitForPolicyUpdate(oc.REST(), oc.Namespace(), "create", templateapi.Resource("templates"), true)
7777
o.Expect(err).NotTo(o.HaveOccurred())
7878

79+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
7980
err = oc.Run("new-app").Args("-f", postgreSQLReplicationTemplate, "-p", fmt.Sprintf("POSTGRESQL_IMAGE=%s", image)).Execute()
8081
o.Expect(err).NotTo(o.HaveOccurred())
8182

@@ -84,10 +85,7 @@ func PostgreSQLReplicationTestFactory(oc *exutil.CLI, image string) func() {
8485

8586
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
8687
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
87-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), postgreSQLHelperName)
88-
if err != nil {
89-
exutil.DumpDeploymentLogs(postgreSQLHelperName, oc)
90-
}
88+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), postgreSQLHelperName, oc)
9189
o.Expect(err).NotTo(o.HaveOccurred())
9290

9391
err = oc.KubeFramework().WaitForAnEndpoint(postgreSQLHelperName)
@@ -99,12 +97,20 @@ func PostgreSQLReplicationTestFactory(oc *exutil.CLI, image string) func() {
9997
table := fmt.Sprintf("table_%0.2d", tableCounter)
10098

10199
master, slaves, helper := CreatePostgreSQLReplicationHelpers(oc.KubeREST().Pods(oc.Namespace()), masterDeployment, slaveDeployment, fmt.Sprintf("%s-1", postgreSQLHelperName), slaveCount)
102-
o.Expect(exutil.WaitUntilAllHelpersAreUp(oc, []exutil.Database{master, helper})).NotTo(o.HaveOccurred())
103-
o.Expect(exutil.WaitUntilAllHelpersAreUp(oc, slaves)).NotTo(o.HaveOccurred())
100+
err := exutil.WaitUntilAllHelpersAreUp(oc, []exutil.Database{master, helper})
101+
if err != nil {
102+
exutil.DumpDeploymentLogs("postgresql-helper", oc)
103+
}
104+
o.Expect(err).NotTo(o.HaveOccurred())
105+
err = exutil.WaitUntilAllHelpersAreUp(oc, slaves)
106+
if err != nil {
107+
exutil.DumpDeploymentLogs("postgresql-slave", oc)
108+
}
109+
o.Expect(err).NotTo(o.HaveOccurred())
104110

105111
// Test if we can query as admin
106112
oc.KubeFramework().WaitForAnEndpoint("postgresql-master")
107-
err := helper.TestRemoteLogin(oc, "postgresql-master")
113+
err = helper.TestRemoteLogin(oc, "postgresql-master")
108114
o.Expect(err).NotTo(o.HaveOccurred())
109115

110116
// Create a new table with random name

‎test/extended/images/s2i_perl.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var _ = g.Describe("[images][perl][Slow] hot deploy for openshift perl image", f
2727
g.It(fmt.Sprintf("should work with hot deploy"), func() {
2828
oc.SetOutputDir(exutil.TestContext.OutputDir)
2929

30+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
3031
g.By(fmt.Sprintf("calling oc new-app -f %q", dancerTemplate))
3132
err := oc.Run("new-app").Args("-f", dancerTemplate).Execute()
3233
o.Expect(err).NotTo(o.HaveOccurred())
@@ -40,10 +41,7 @@ var _ = g.Describe("[images][perl][Slow] hot deploy for openshift perl image", f
4041

4142
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4243
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
43-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "dancer-mysql-example")
44-
if err != nil {
45-
exutil.DumpDeploymentLogs("dancer-mysql-example", oc)
46-
}
44+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "dancer-mysql-example", oc)
4745
o.Expect(err).NotTo(o.HaveOccurred())
4846

4947
g.By("waiting for endpoint")

‎test/extended/images/s2i_php.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ var _ = g.Describe("[images][php][Slow] hot deploy for openshift php image", fun
2525
g.It(fmt.Sprintf("should work with hot deploy"), func() {
2626
oc.SetOutputDir(exutil.TestContext.OutputDir)
2727

28+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
2829
g.By(fmt.Sprintf("calling oc new-app -f %q -p %q", cakephpTemplate, hotDeployParam))
2930
err := oc.Run("new-app").Args("-f", cakephpTemplate, "-p", hotDeployParam).Execute()
3031
o.Expect(err).NotTo(o.HaveOccurred())
@@ -38,10 +39,7 @@ var _ = g.Describe("[images][php][Slow] hot deploy for openshift php image", fun
3839

3940
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4041
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
41-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "cakephp-mysql-example")
42-
if err != nil {
43-
exutil.DumpDeploymentLogs("cakephp-mysql-example", oc)
44-
}
42+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "cakephp-mysql-example", oc)
4543
o.Expect(err).NotTo(o.HaveOccurred())
4644

4745
g.By("waiting for endpoint")

‎test/extended/images/s2i_python.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ var _ = g.Describe("[images][python][Slow] hot deploy for openshift python image
2727
g.It(fmt.Sprintf("should work with hot deploy"), func() {
2828
oc.SetOutputDir(exutil.TestContext.OutputDir)
2929

30+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
3031
g.By(fmt.Sprintf("calling oc new-app %s", djangoRepository))
3132
err := oc.Run("new-app").Args(djangoRepository, "--strategy=source").Execute()
3233
o.Expect(err).NotTo(o.HaveOccurred())
@@ -40,10 +41,7 @@ var _ = g.Describe("[images][python][Slow] hot deploy for openshift python image
4041

4142
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4243
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
43-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "django-ex")
44-
if err != nil {
45-
exutil.DumpDeploymentLogs("django-ex", oc)
46-
}
44+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "django-ex", oc)
4745
o.Expect(err).NotTo(o.HaveOccurred())
4846

4947
g.By("waiting for endpoint")

‎test/extended/images/s2i_ruby.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ var _ = g.Describe("[images][ruby][Slow] hot deploy for openshift ruby image", f
2626
g.It(fmt.Sprintf("should work with hot deploy"), func() {
2727
oc.SetOutputDir(exutil.TestContext.OutputDir)
2828

29+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
2930
g.By(fmt.Sprintf("calling oc new-app -f %q", railsTemplate))
3031
err := oc.Run("new-app").Args("-f", railsTemplate).Execute()
3132
o.Expect(err).NotTo(o.HaveOccurred())
@@ -39,10 +40,7 @@ var _ = g.Describe("[images][ruby][Slow] hot deploy for openshift ruby image", f
3940

4041
// oc.KubeFramework().WaitForAnEndpoint currently will wait forever; for now, prefacing with our WaitForADeploymentToComplete,
4142
// which does have a timeout, since in most cases a failure in the service coming up stems from a failed deployment
42-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "rails-postgresql-example")
43-
if err != nil {
44-
exutil.DumpDeploymentLogs("rails-postgresql-example", oc)
45-
}
43+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "rails-postgresql-example", oc)
4644
o.Expect(err).NotTo(o.HaveOccurred())
4745

4846
g.By("waiting for endpoint")

‎test/extended/images/sample_repos.go

Lines changed: 27 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,14 @@ import (
1111
)
1212

1313
type SampleRepoConfig struct {
14-
repoName string
15-
templateURL string
16-
buildConfigName string
17-
serviceName string
18-
deploymentConfigName string
19-
expectedString string
20-
appPath string
14+
repoName string
15+
templateURL string
16+
buildConfigName string
17+
serviceName string
18+
deploymentConfigName string
19+
expectedString string
20+
appPath string
21+
dbDeploymentConfigName string
2122
}
2223

2324
// NewSampleRepoTest creates a function for a new ginkgo test case that will instantiate a template
@@ -38,6 +39,7 @@ func NewSampleRepoTest(c SampleRepoConfig) func() {
3839
g.It(fmt.Sprintf("should build a "+c.repoName+" image and run it in a pod"), func() {
3940
oc.SetOutputDir(exutil.TestContext.OutputDir)
4041

42+
exutil.CheckOpenShiftNamespaceImageStreams(oc)
4143
g.By(fmt.Sprintf("calling oc new-app with the " + c.repoName + " example template"))
4244
err := oc.Run("new-app").Args("-f", c.templateURL).Execute()
4345
o.Expect(err).NotTo(o.HaveOccurred())
@@ -52,13 +54,16 @@ func NewSampleRepoTest(c SampleRepoConfig) func() {
5254
}
5355
o.Expect(err).NotTo(o.HaveOccurred())
5456

55-
g.By("expecting the deployment to be complete")
56-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), c.deploymentConfigName)
57-
if err != nil {
58-
exutil.DumpDeploymentLogs(c.deploymentConfigName, oc)
59-
}
57+
g.By("expecting the app deployment to be complete")
58+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), c.deploymentConfigName, oc)
6059
o.Expect(err).NotTo(o.HaveOccurred())
6160

61+
if len(c.dbDeploymentConfigName) > 0 {
62+
g.By("expecting the db deployment to be complete")
63+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), c.dbDeploymentConfigName, oc)
64+
o.Expect(err).NotTo(o.HaveOccurred())
65+
}
66+
6267
g.By("expecting the service is available")
6368
serviceIP, err := oc.Run("get").Args("service", c.serviceName).Template("{{ .spec.clusterIP }}").Output()
6469
o.Expect(err).NotTo(o.HaveOccurred())
@@ -68,6 +73,7 @@ func NewSampleRepoTest(c SampleRepoConfig) func() {
6873
err = oc.KubeFramework().WaitForAnEndpoint(c.serviceName)
6974
o.Expect(err).NotTo(o.HaveOccurred())
7075

76+
g.By("verifying string from app request")
7177
response, err := exutil.FetchURL("http://"+serviceIP+":8080"+c.appPath, time.Duration(30*time.Second))
7278
o.Expect(err).NotTo(o.HaveOccurred())
7379
o.Expect(response).Should(o.ContainSubstring(c.expectedString))
@@ -87,6 +93,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
8793
"rails-postgresql-example",
8894
"Listing articles",
8995
"/articles",
96+
"postgresql",
9097
},
9198
))
9299

@@ -99,6 +106,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
99106
"django-psql-example",
100107
"Page views: 1",
101108
"",
109+
"postgresql",
102110
},
103111
))
104112

@@ -111,6 +119,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
111119
"nodejs-mongodb-example",
112120
"<span class=\"code\" id=\"count-value\">1</span>",
113121
"",
122+
"mongodb",
114123
},
115124
))
116125

@@ -123,6 +132,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
123132
"cakephp-mysql-example",
124133
"<span class=\"code\" id=\"count-value\">1</span>",
125134
"",
135+
"mysql",
126136
},
127137
))
128138

@@ -135,6 +145,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
135145
"dancer-mysql-example",
136146
"<span class=\"code\" id=\"count-value\">1</span>",
137147
"",
148+
"database",
138149
},
139150
))
140151

@@ -148,6 +159,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
148159
"django-example",
149160
"Welcome",
150161
"",
162+
"",
151163
},
152164
))
153165

@@ -160,6 +172,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
160172
"nodejs-example",
161173
"Welcome",
162174
"",
175+
"",
163176
},
164177
))
165178

@@ -172,6 +185,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
172185
"cakephp-example",
173186
"Welcome",
174187
"",
188+
"",
175189
},
176190
))
177191

@@ -184,6 +198,7 @@ var _ = g.Describe("[images][Slow] openshift sample application repositories", f
184198
"dancer-example",
185199
"Welcome",
186200
"",
201+
"",
187202
},
188203
))
189204

‎test/extended/jenkins/kubernetes_plugin.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,7 @@ var _ = g.Describe("[jenkins] schedule jobs on pod slaves", func() {
7070
o.Expect(err).NotTo(o.HaveOccurred())
7171

7272
g.By("wait for jenkins deployment")
73-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "jenkins")
74-
if err != nil {
75-
exutil.DumpDeploymentLogs("jenkins", oc)
76-
}
73+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "jenkins", oc)
7774
o.Expect(err).NotTo(o.HaveOccurred())
7875

7976
g.By("get ip and port for jenkins service")

‎test/extended/jenkins/plugin.go

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@ var _ = g.Describe("[jenkins][Slow] openshift pipeline plugin", func() {
123123
o.Expect(err).NotTo(o.HaveOccurred())
124124

125125
g.By("waiting for jenkins deployment")
126-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "jenkins")
127-
if err != nil {
128-
exutil.DumpDeploymentLogs("jenkins", oc)
129-
}
126+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "jenkins", oc)
130127
o.Expect(err).NotTo(o.HaveOccurred())
131128

132129
g.By("get ip and port for jenkins service")
@@ -165,15 +162,9 @@ var _ = g.Describe("[jenkins][Slow] openshift pipeline plugin", func() {
165162
// we leverage some of the openshift utilities for waiting for the deployment before we poll
166163
// jenkins for the successful job completion
167164
g.By("waiting for frontend, frontend-prod deployments as signs that the build has finished")
168-
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "frontend")
169-
if err != nil {
170-
exutil.DumpDeploymentLogs("frontend", oc)
171-
}
165+
err := exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "frontend", oc)
172166
o.Expect(err).NotTo(o.HaveOccurred())
173-
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "frontend-prod")
174-
if err != nil {
175-
exutil.DumpDeploymentLogs("frontend-prod", oc)
176-
}
167+
err = exutil.WaitForADeploymentToComplete(oc.KubeREST().ReplicationControllers(oc.Namespace()), "frontend-prod", oc)
177168
o.Expect(err).NotTo(o.HaveOccurred())
178169

179170
g.By("get build console logs and see if succeeded")

0 commit comments

Comments
 (0)