From 8accde81057e7607ea0b5745f1444c9002f1476e Mon Sep 17 00:00:00 2001 From: Vu Dinh Date: Tue, 2 Sep 2025 09:44:13 -0400 Subject: [PATCH] Skip oauth test for external control plane topology For HyperShift, the control plane topology is external as control plane components are not deployed in management cluster. As a result, the oauth operator is unavailable and this test should be skipped. Moving the topology check to the top before the cluster auth operator check will ensure this test is skipped in external topology mode. Signed-off-by: Vu Dinh --- test/extended/oauth/requestheaders.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/extended/oauth/requestheaders.go b/test/extended/oauth/requestheaders.go index 9147b51c311e..4e6311c5adc5 100644 --- a/test/extended/oauth/requestheaders.go +++ b/test/extended/oauth/requestheaders.go @@ -62,20 +62,20 @@ var _ = g.Describe("[Serial] [sig-auth][Feature:OAuthServer] [RequestHeaders] [I var oc = exutil.NewCLI("request-headers") g.It("test RequestHeaders IdP [apigroup:config.openshift.io][apigroup:user.openshift.io]", func() { - - // In some rare cases, CAO might be damaged when entering this test. If it is - the results - // of this test might flaky. This check ensures that we capture such situation early and - // investigate why it wasn't ready before this test. - e2e.Logf("Ensuring CAO is available==True, progressing==False, degraded==False") - waitForAuthenticationProgressing(oc, configv1.ConditionFalse) - controlPlaneTopology, err := exutil.GetControlPlaneTopology(oc) o.Expect(err).NotTo(o.HaveOccurred()) + // Skip the test if the controle plane topology is External if *controlPlaneTopology == configv1.ExternalTopologyMode { e2eskipper.Skipf("External clusters do not allow customization of the Identity Providers for the cluster.") } + // In some rare cases, CAO might be damaged when entering this test. If it is - the results + // of this test might flaky. This check ensures that we capture such situation early and + // investigate why it wasn't ready before this test. + e2e.Logf("Ensuring CAO is available==True, progressing==False, degraded==False") + waitForAuthenticationProgressing(oc, configv1.ConditionFalse) + caCert, caKey := createClientCA(oc.AdminKubeClient().CoreV1()) defer oc.AdminKubeClient().CoreV1().ConfigMaps("openshift-config").Delete(context.Background(), clientCAName, metav1.DeleteOptions{})