From 661d925a59c33e9c0177a3c2b6c751a967f69b02 Mon Sep 17 00:00:00 2001 From: Anthony Vollmer Date: Thu, 19 Feb 2026 14:27:53 -0500 Subject: [PATCH] e2e: fix admin credential lifecycle skip guard for integration/parallel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit d38165a4a introduced skip guards across three steps of the admin credential lifecycle test to work around ARO-23882 in the integration/parallel suite until 2026-03-11. However, the final skip guard (verifying that a newly-issued credential works post-revocation) was incorrectly gated on `skipInt`, a flag only set when the revocation wait loop itself times out. On the Feb 19 2026 run, credential revocation completed successfully for all three credentials within the 5-minute window, so `skipInt` remained false. The final skip guard therefore had no effect, and the test failed when the newly-issued credential returned 401 Unauthorized — the same underlying issue (ARO-23882 / OCPBUGS-62177) that the skip was meant to paper over. Previous runs between Feb 12-18 happened to pass because at least one credential took longer than 5 minutes to revoke, setting `skipInt=true` accidentally triggering the skip. That is: the test was passing for the wrong reason. Remove the `skipInt &&` condition so the final skip guard mirrors the other two guards and unconditionally skips in integration/parallel until the deadline. --- test/e2e/admin_credential_lifecycle.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/test/e2e/admin_credential_lifecycle.go b/test/e2e/admin_credential_lifecycle.go index db95b5627c..31a30037e7 100644 --- a/test/e2e/admin_credential_lifecycle.go +++ b/test/e2e/admin_credential_lifecycle.go @@ -202,7 +202,6 @@ var _ = Describe("Customer", func() { } By("validating all admin credentials now fail after revocation") - skipInt := false for i, cred := range credentials { By(fmt.Sprintf("verifying admin credential %d now fails", i+1)) // TODO(bvesel) remove once OCPBUGS-62177 is implemented @@ -231,7 +230,6 @@ var _ = Describe("Customer", func() { }) if err != nil && os.Getenv("ARO_HCP_SUITE_NAME") == "integration/parallel" && time.Now().Before(time.Date(2026, 3, 11, 0, 0, 0, 0, time.UTC)) { By("skipping in integration/parallel suite") - skipInt = true break } else { Expect(err).NotTo(HaveOccurred(), "Admin credential %d should fail after revocation, last error: %v", i+1, lastError) @@ -252,7 +250,7 @@ var _ = Describe("Customer", func() { Expect(newAdminRESTConfig).NotTo(BeNil()) By("verifying new admin credentials work after revocation") - if skipInt && os.Getenv("ARO_HCP_SUITE_NAME") == "integration/parallel" && time.Now().Before(time.Date(2026, 3, 11, 0, 0, 0, 0, time.UTC)) { + if os.Getenv("ARO_HCP_SUITE_NAME") == "integration/parallel" && time.Now().Before(time.Date(2026, 3, 11, 0, 0, 0, 0, time.UTC)) { By("skipping in integration/parallel suite") } else { Expect(verifiers.VerifyHCPCluster(ctx, newAdminRESTConfig)).To(Succeed(), "New admin credentials should work after revocation")