Skip to content

Commit 5b33b43

Browse files
dhaiducekopenshift-merge-robot
dhaiducek
authored and
openshift-merge-robot
committed
Bump ManagedClusterAddon removal timeout
Signed-off-by: Dale Haiducek <[email protected]>
1 parent e5f3c39 commit 5b33b43

File tree

3 files changed

+16
-16
lines changed

3 files changed

+16
-16
lines changed

‎test/e2e/case1_framework_deployment_test.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ var _ = Describe("Test framework deployment", func() {
4848
checkArgs(cluster, expectedArgs...)
4949

5050
By(logPrefix + "removing the framework deployment when the ManagedClusterAddOn CR is removed")
51-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
51+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
5252
deploy = GetWithTimeout(
5353
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
5454
)
@@ -104,7 +104,7 @@ var _ = Describe("Test framework deployment", func() {
104104
)
105105
Expect(err).ToNot(HaveOccurred())
106106

107-
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 60)
107+
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 90)
108108
Expect(deploy).To(BeNil())
109109

110110
namespace := GetWithTimeout(hubClient, gvrNamespace, installNamespace, "", false, 120)
@@ -150,7 +150,7 @@ var _ = Describe("Test framework deployment", func() {
150150
)
151151
Expect(err).ToNot(HaveOccurred())
152152

153-
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 30)
153+
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 90)
154154
Expect(deploy).To(BeNil())
155155

156156
By(logPrefix + "verifying install namespace is not removed when the ManagedClusterAddOn CR is removed")
@@ -194,7 +194,7 @@ var _ = Describe("Test framework deployment", func() {
194194
checkArgs(cluster, "--log-encoder=console", "--log-level=8", "--v=6")
195195

196196
By(logPrefix + "removing the framework deployment when the ManagedClusterAddOn CR is removed")
197-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
197+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
198198
deploy = GetWithTimeout(
199199
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
200200
)
@@ -243,7 +243,7 @@ var _ = Describe("Test framework deployment", func() {
243243
Expect(tolerations[0]).To(Equal(expected))
244244

245245
By(logPrefix + "removing the framework deployment when the ManagedClusterAddOn CR is removed")
246-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
246+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
247247
deploy = GetWithTimeout(
248248
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
249249
)
@@ -295,7 +295,7 @@ var _ = Describe("Test framework deployment", func() {
295295
checkArgs(cluster, "--log-encoder=console", "--log-level=8", "--v=6")
296296

297297
By(logPrefix + "deleting the managedclusteraddon")
298-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
298+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
299299
deploy = GetWithTimeout(
300300
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
301301
)
@@ -406,7 +406,7 @@ var _ = Describe("Test framework deployment", func() {
406406
checkArgs(cluster, "--log-encoder=console", "--log-level=8", "--v=6")
407407

408408
By(logPrefix + "deleting the managedclusteraddon")
409-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
409+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
410410
deploy = GetWithTimeout(
411411
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
412412
)
@@ -452,7 +452,7 @@ var _ = Describe("Test framework deployment", func() {
452452
}, 60, 5).Should(HaveLen(defaultLength))
453453

454454
By(logPrefix + "deleting the managedclusteraddon")
455-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
455+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
456456
deploy = GetWithTimeout(
457457
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
458458
)
@@ -508,7 +508,7 @@ var _ = Describe("Test framework deployment", func() {
508508
}, 30, 5).Should(HaveLen(defaultLength))
509509

510510
By(logPrefix + "deleting the managedclusteraddon")
511-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
511+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
512512
deploy = GetWithTimeout(
513513
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
514514
)
@@ -535,7 +535,7 @@ var _ = Describe("Test framework deployment", func() {
535535
GetWithTimeoutClusterResource(cluster.clusterClient, gvrNamespace, cluster.clusterName, true, 15)
536536

537537
By(logPrefix + "deleting the managedclusteraddon")
538-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
538+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
539539
deploy = GetWithTimeout(
540540
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
541541
)
@@ -579,7 +579,7 @@ var _ = Describe("Test framework deployment", func() {
579579
}
580580

581581
By(logPrefix + "deleting the managedclusteraddon")
582-
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
582+
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
583583
deploy = GetWithTimeout(
584584
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
585585
)

‎test/e2e/case2_config_deployment_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {
100100

101101
By(logPrefix +
102102
"removing the config-policy-controller deployment when the ManagedClusterAddOn CR is removed")
103-
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=30s")
103+
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=90s")
104104
deploy := GetWithTimeout(
105105
cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, false, 180,
106106
)
@@ -150,7 +150,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {
150150

151151
By(logPrefix +
152152
"removing the config-policy-controller deployment when the ManagedClusterAddOn CR is removed")
153-
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=30s")
153+
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=90s")
154154
deploy = GetWithTimeout(
155155
cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, false, 180,
156156
)
@@ -395,7 +395,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {
395395

396396
By(logPrefix +
397397
"removing the config-policy-controller deployment when the ManagedClusterAddOn CR is removed")
398-
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=30s")
398+
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=90s")
399399
deploy = GetWithTimeout(
400400
cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, false, 180,
401401
)
@@ -502,7 +502,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {
502502
"--timeout=15s",
503503
)
504504

505-
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=30s")
505+
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=90s")
506506
deploy = GetWithTimeout(
507507
cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, false, 30,
508508
)

‎test/e2e/utils_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func Kubectl(args ...string) string {
4646
// in case of failure, print command output (including error)
4747
GinkgoWriter.Printf("output\n======\n%s\n", stdout.String())
4848
GinkgoWriter.Printf("error\n======\n%s\n", stderr.String())
49-
Fail(fmt.Sprintf("Error: %v", err))
49+
Fail(fmt.Sprintf("Error: %v", err), 1)
5050
}
5151

5252
return stdout.String()

0 commit comments

Comments
 (0)