Skip to content

OCPBUGS-62811: for incompatible test add func to wait builder and deployer SA creation by OCP controller #503

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

Merged
merged 1 commit into from
Oct 8, 2025
+8 −1
Merged

OCPBUGS-62811: for incompatible test add func to wait builder and deployer SA creation by OCP controller #503

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
2 changes: 1 addition & 1 deletion 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 @@ -185,7 +185,7 @@ func ExpectServiceAccountExists(ctx context.Context, name, namespace string) {
Eventually(func(g Gomega) {
err := k8sClient.Get(ctx, client.ObjectKey{Name: name, Namespace: namespace}, sa)
g.Expect(err).ToNot(HaveOccurred(), fmt.Sprintf("failed to get ServiceAccount %q/%q: %v", namespace, name, err))
}).WithTimeout(10*time.Second).WithPolling(1*time.Second).Should(Succeed(), "ServiceAccount %q/%q did not become visible within timeout", namespace, name)
}).WithTimeout(5*time.Minute).WithPolling(3*time.Second).Should(Succeed(), "ServiceAccount %q/%q did not become visible within timeout", namespace, name)
}

// ExpectClusterRoleBindingExists waits for a ClusterRoleBinding to be available and visible to the client.
Expand Down
7 changes: 7 additions & 0 deletions openshift/tests-extension/test/olmv1-incompatible.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,13 @@ var _ = Describe("[sig-olmv1][OCPFeatureGate:NewOLM][Skipped:Disconnected] OLMv1
nsCleanup := createNamespace(nsName)
DeferCleanup(nsCleanup)

// The builder (and deployer) service accounts are created by OpenShift itself which injects them in the NS.
By(fmt.Sprintf("waiting for builder serviceaccount in %s", nsName))
helpers.ExpectServiceAccountExists(ctx, "builder", nsName)

By(fmt.Sprintf("waiting for deployer serviceaccount in %s", nsName))
helpers.ExpectServiceAccountExists(ctx, "deployer", nsName)

By("applying image-puller RoleBinding")
rbCleanup := createImagePullerRoleBinding(rbName, nsName)
DeferCleanup(rbCleanup)
Expand Down