Skip to content

Commit

Permalink
Bump ManagedClusterAddon removal timeout
Browse files Browse the repository at this point in the history 
Signed-off-by: Dale Haiducek <19750917+dhaiducek@users.noreply.github.com>
  • Loading branch information
@dhaiducek @openshift-merge-robot
dhaiducek authored and openshift-merge-robot committed Sep 26, 2023
1 parent e5f3c39 commit 5b33b43
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
22 changes: 11 additions & 11 deletions test/e2e/case1_framework_deployment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ var _ = Describe("Test framework deployment", func() {
checkArgs(cluster, expectedArgs...)

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

deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 60)
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 90)
Expect(deploy).To(BeNil())

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

deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 30)
deploy := GetWithTimeout(hubClient, gvrDeployment, case1DeploymentName, installNamespace, false, 90)
Expect(deploy).To(BeNil())

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

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

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

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

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

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

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

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

By(logPrefix + "deleting the managedclusteraddon")
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=30s")
Kubectl("delete", "-n", cluster.clusterName, "-f", case1ManagedClusterAddOnCR, "--timeout=90s")
deploy = GetWithTimeout(
cluster.clusterClient, gvrDeployment, case1DeploymentName, addonNamespace, false, 30,
)
Expand Down
8 changes: 4 additions & 4 deletions test/e2e/case2_config_deployment_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ var _ = Describe("Test config-policy-controller deployment", func() {

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

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

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

Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=30s")
Kubectl("delete", "-n", cluster.clusterName, "-f", case2ManagedClusterAddOnCR, "--timeout=90s")
deploy = GetWithTimeout(
cluster.clusterClient, gvrDeployment, case2DeploymentName, addonNamespace, false, 30,
)
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/utils_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ func Kubectl(args ...string) string {
// in case of failure, print command output (including error)
GinkgoWriter.Printf("output\n======\n%s\n", stdout.String())
GinkgoWriter.Printf("error\n======\n%s\n", stderr.String())
Fail(fmt.Sprintf("Error: %v", err))
Fail(fmt.Sprintf("Error: %v", err), 1)
}

return stdout.String()
Expand Down

0 comments on commit 5b33b43

Please sign in to comment.