Skip to content

OCPBUGS-77847: Increase install timeout and add diagnostic logging for CE install tests #660

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

Open
camilamacedo86 wants to merge 1 commit into
base: main
Choose a base branch
from
+27 −2
Open

OCPBUGS-77847: Increase install timeout and add diagnostic logging for CE install tests #660

Show file tree
Hide file tree
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
23 changes: 21 additions & 2 deletions openshift/tests-extension/pkg/helpers/cluster_extension.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ func NewClusterExtensionObject(pkg, version, ceName, saName, namespace string, o
}

// ExpectClusterExtensionToBeInstalled checks that the ClusterExtension has both Progressing=True and Installed=True.
// Uses InstallTimeout because the BoxcutterRuntime requires all availability probes to pass
// before marking the extension as installed.
func ExpectClusterExtensionToBeInstalled(ctx context.Context, name string) {
k8sClient := env.Get().K8sClient
Eventually(func(g Gomega) {
Expand All @@ -153,13 +155,30 @@ func ExpectClusterExtensionToBeInstalled(ctx context.Context, name string) {
g.Expect(conditions).NotTo(BeEmpty(), fmt.Sprintf("ClusterExtension %q has empty status.conditions", name))

progressing := meta.FindStatusCondition(conditions, string(olmv1.TypeProgressing))
installed := meta.FindStatusCondition(conditions, string(olmv1.TypeInstalled))

pStatus, pReason, pMsg := conditionSummary(progressing)
iStatus, iReason, iMsg := conditionSummary(installed)
fmt.Fprintf(GinkgoWriter, "CE %q: Progressing=%s/%s (%s), Installed=%s/%s (%s)\n",
name, pStatus, pReason, pMsg, iStatus, iReason, iMsg)

g.Expect(progressing).ToNot(BeNil(), "Progressing condition not found")
g.Expect(progressing.Status).To(Equal(metav1.ConditionTrue), "Progressing should be True")

installed := meta.FindStatusCondition(conditions, string(olmv1.TypeInstalled))
g.Expect(installed).ToNot(BeNil(), "Installed condition not found")
g.Expect(installed.Status).To(Equal(metav1.ConditionTrue), "Installed should be True")
}).WithTimeout(DefaultTimeout).WithPolling(DefaultPolling).Should(Succeed())
}).WithTimeout(InstallTimeout).WithPolling(DefaultPolling).Should(Succeed())
}

func conditionSummary(cond *metav1.Condition) (string, string, string) {
if cond == nil {
return "<nil>", "", ""
}
msg := cond.Message
if len(msg) > 120 {
msg = msg[:120] + "..."
}
return string(cond.Status), cond.Reason, msg
}

// EnsureCleanupClusterExtension attempts to delete any ClusterExtension and a specified CRD
Expand Down
6 changes: 6 additions & 0 deletions openshift/tests-extension/pkg/helpers/defaults.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@ const (
// DefaultTimeout is how long we wait before giving up on an Eventually check.
DefaultTimeout = 5 * time.Minute

// InstallTimeout is how long we wait for an operator to be fully installed.
// With the BoxcutterRuntime, Installed=True is only set after all availability
// probes pass (Deployments available, CRDs established, etc.), which can take
// longer than DefaultTimeout on resource-constrained or non-standard clusters.
InstallTimeout = 10 * time.Minute

// DefaultPolling is how often we check again during an Eventually test.
DefaultPolling = 3 * time.Second
)