Skip to content

OCPBUGS-100388: Fix project name collision in test framework #31464

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
redhat-chai-bot wants to merge 2 commits into
base: main
Choose a base branch
from
+46 −14
Open

OCPBUGS-100388: Fix project name collision in test framework #31464

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e785fb
OCPBUGS-98468: Fix project name collision in test framework
redhat-chai-bot Jul 31, 2026
e41e44e
fixup: use <= for maxRetries to allow initial attempt + 3 retries
redhat-chai-bot Jul 31, 2026
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
60 changes: 46 additions & 14 deletions test/extended/util/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,10 +367,25 @@ func (c *CLI) setupProject() string {
c.SetNamespace(newNamespace).ChangeUser(fmt.Sprintf("%s-user", newNamespace))
framework.Logf("The user is now %q", c.Username())

framework.Logf("Creating project %q", newNamespace)
_, err := c.ProjectClient().ProjectV1().ProjectRequests().Create(context.Background(), &projectv1.ProjectRequest{
ObjectMeta: metav1.ObjectMeta{Name: newNamespace},
}, metav1.CreateOptions{})
const maxRetries = 3
var err error
for attempt := 0; attempt <= maxRetries; attempt++ {
framework.Logf("Creating project %q", newNamespace)
_, err = c.ProjectClient().ProjectV1().ProjectRequests().Create(context.Background(), &projectv1.ProjectRequest{
ObjectMeta: metav1.ObjectMeta{Name: newNamespace},
}, metav1.CreateOptions{})
if err == nil {
break
}
if !apierrors.IsAlreadyExists(err) {
break
}
if attempt < maxRetries {
framework.Logf("Project name %q already exists (attempt %d/%d), generating a new name", newNamespace, attempt+1, maxRetries)
newNamespace = names.SimpleNameGenerator.GenerateName(fmt.Sprintf("e2e-test-%s-", c.kubeFramework.BaseName))
c.SetNamespace(newNamespace).ChangeUser(fmt.Sprintf("%s-user", newNamespace))
}
}
o.Expect(err).NotTo(o.HaveOccurred())

c.kubeFramework.AddNamespacesToDelete(&corev1.Namespace{ObjectMeta: metav1.ObjectMeta{Name: newNamespace}})
Expand Down Expand Up @@ -487,18 +502,35 @@ func (c *CLI) setupNamespace() string {
serviceAccountName := "default"
c.SetNamespace(newNamespace)

nsObject := &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: newNamespace,
Annotations: map[string]string{
annotations.OpenShiftDescription: username,
annotations.OpenShiftDisplayName: newNamespace,
"openshift.io/requester": username,
const maxRetries = 3
var err error
var nsObject *corev1.Namespace
for attempt := 0; attempt <= maxRetries; attempt++ {
nsObject = &corev1.Namespace{
ObjectMeta: metav1.ObjectMeta{
Name: newNamespace,
Annotations: map[string]string{
annotations.OpenShiftDescription: username,
annotations.OpenShiftDisplayName: newNamespace,
"openshift.io/requester": username,
},
},
},
}
framework.Logf("Creating namespace %q", newNamespace)
_, err = c.AdminKubeClient().CoreV1().Namespaces().Create(context.Background(), nsObject, metav1.CreateOptions{})
if err == nil {
break
}
if !apierrors.IsAlreadyExists(err) {
break
}
if attempt < maxRetries {
framework.Logf("Namespace name %q already exists (attempt %d/%d), generating a new name", newNamespace, attempt+1, maxRetries)
newNamespace = names.SimpleNameGenerator.GenerateName(fmt.Sprintf("e2e-test-%s-", c.kubeFramework.BaseName))
username = fmt.Sprintf("%s-user", newNamespace)
c.SetNamespace(newNamespace)
}
}
framework.Logf("Creating namespace %q", newNamespace)
_, err := c.AdminKubeClient().CoreV1().Namespaces().Create(context.Background(), nsObject, metav1.CreateOptions{})
o.Expect(err).NotTo(o.HaveOccurred())
c.kubeFramework.AddNamespacesToDelete(nsObject)

Expand Down