From 9b7c0663607e3ed71f401c9f7b314d2f8bfa7eae Mon Sep 17 00:00:00 2001 From: jubittajohn Date: Thu, 14 May 2026 18:30:27 -0400 Subject: [PATCH] NO-JIRA: Fix flaky storage-admin e2e test The test used a hardcoded project name "policy-can-i" which caused AlreadyExists errors on retries. Use a unique project name via names.SimpleNameGenerator and fix the "sytem" typo in --as-group. Co-Authored-By: Claude Opus 4.6 --- test/extended/cli/admin.go | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/test/extended/cli/admin.go b/test/extended/cli/admin.go index 45e7d1be676e..90db69ac05f9 100644 --- a/test/extended/cli/admin.go +++ b/test/extended/cli/admin.go @@ -301,20 +301,21 @@ var _ = g.Describe("[sig-cli] oc adm", func() { o.Expect(out).To(o.ContainSubstring(`cannot list resource "rolebindings" in API group "rbac.authorization.k8s.io"`)) g.By("Test that scoped storage-admin now an admin in project foo") - o.Expect(oc.Run("new-project").Args("--skip-config-write=true", "--as=storage-adm2", "--as-group=system:authenticated:oauth", "--as-group=sytem:authenticated", "policy-can-i").Execute()).NotTo(o.HaveOccurred()) + projectName := names.SimpleNameGenerator.GenerateName("policy-can-i-") + o.Expect(oc.Run("new-project").Args("--skip-config-write=true", "--as=storage-adm2", "--as-group=system:authenticated:oauth", "--as-group=system:authenticated", projectName).Execute()).NotTo(o.HaveOccurred()) defer func() { - oc.Run("delete").Args("project/policy-can-i").Execute() + oc.Run("delete").Args("project/" + projectName).Execute() }() - out, err = oc.Run("auth", "can-i").Args("--namespace=policy-can-i", "--as=storage-adm2", "create", "pod", "--all-namespaces").Output() + out, err = oc.Run("auth", "can-i").Args("--namespace="+projectName, "--as=storage-adm2", "create", "pod", "--all-namespaces").Output() o.Expect(err).To(o.HaveOccurred()) o.Expect(out).To(o.HaveSuffix("no")) - out, err = oc.Run("auth", "can-i").Args("--namespace=policy-can-i", "--as=storage-adm2", "create", "pod").Output() + out, err = oc.Run("auth", "can-i").Args("--namespace="+projectName, "--as=storage-adm2", "create", "pod").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.HaveSuffix("yes")) - out, err = oc.Run("auth", "can-i").Args("--namespace=policy-can-i", "--as=storage-adm2", "create", "pvc").Output() + out, err = oc.Run("auth", "can-i").Args("--namespace="+projectName, "--as=storage-adm2", "create", "pvc").Output() o.Expect(err).NotTo(o.HaveOccurred()) o.Expect(out).To(o.HaveSuffix("yes")) })