fix: replace hardcoded sleeps with waitUntil polling

DavidRajnoha · cursoragent · DavidRajnoha · commit f9394935682b · 2026-02-25T17:26:57.000Z
Setup verification improvements:
- Replace all `sleep N &amp;&amp; oc wait` patterns with cy.waitUntil-based
  polling via shared wait-utils.ts helpers (waitForPodsReady,
  waitForPodsReadyOrAbsent, waitForResourceCondition)
- Make UI verification in waitForCOOReady conditional on COO_UI_INSTALL
  since CLI readiness check is sufficient for bundle installs
- Eliminates ~195s of unconditional sleeping in a full COO setup

Co-authored-by: Cursor &lt;cursoragent@cursor.com&gt;
diff --git a/web/cypress/support/commands/coo-install-commands.ts b/web/cypress/support/commands/coo-install-commands.ts
@@ -1,3 +1,4 @@
+import 'cypress-wait-until';
 import { operatorHubPage } from '../../views/operator-hub-page';
 import { nav } from '../../views/nav';
 
@@ -76,38 +77,53 @@ export const cooInstallUtils = {
 
   waitForCOOReady(MCP: { namespace: string }): void {
     cy.log('Check Cluster Observability Operator status');
+    const kubeconfig = Cypress.env('KUBECONFIG_PATH');
 
-    cy.exec(`oc project ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.exec(`oc project ${MCP.namespace} --kubeconfig ${kubeconfig}`);
+
+    cy.waitUntil(
+      () =>
+        cy
+          .exec(
+            `oc get pods -n ${MCP.namespace} -o name --kubeconfig ${kubeconfig} | grep observability-operator | grep -v bundle`,
+            { failOnNonZeroExit: false },
+          )
+          .then((result) => result.code === 0 && result.stdout.trim().length > 0),
+      {
+        timeout: readyTimeoutMilliseconds,
+        interval: 10000,
+        errorMsg: `Observability operator pod not found in namespace ${MCP.namespace}`,
+      },
+    );
 
     cy.exec(
-      `sleep 60 && oc get pods -n ${MCP.namespace} | grep observability-operator | grep -v bundle | awk '{print $1}'`,
-      { timeout: readyTimeoutMilliseconds, failOnNonZeroExit: true },
+      `oc get pods -n ${MCP.namespace} -o name --kubeconfig ${kubeconfig} | grep observability-operator | grep -v bundle`,
     )
       .its('stdout')
-      .then((podName) => {
-        const COO_POD_NAME = podName.trim();
-        cy.log(`Successfully retrieved Pod Name: ${COO_POD_NAME}`);
+      .then((podOutput) => {
+        const podName = podOutput.trim();
+        cy.log(`Found COO pod: ${podName}`);
+
         cy.exec(
-          `sleep 15 && oc wait --for=condition=Ready pods ${COO_POD_NAME} -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-          {
-            timeout: readyTimeoutMilliseconds,
-            failOnNonZeroExit: true,
-          },
+          `oc wait --for=condition=Ready ${podName} -n ${MCP.namespace} --timeout=120s --kubeconfig ${kubeconfig}`,
+          { timeout: readyTimeoutMilliseconds, failOnNonZeroExit: true },
         ).then((result) => {
           expect(result.code).to.eq(0);
           cy.log(`Observability-operator pod is now running in namespace: ${MCP.namespace}`);
         });
       });
 
-    cy.get('#page-sidebar').then(($sidebar) => {
-      const section = $sidebar.text().includes('Ecosystem') ? 'Ecosystem' : 'Operators';
-      nav.sidenav.clickNavLink([section, 'Installed Operators']);
-    });
+    if (Cypress.env('COO_UI_INSTALL')) {
+      cy.get('#page-sidebar').then(($sidebar) => {
+        const section = $sidebar.text().includes('Ecosystem') ? 'Ecosystem' : 'Operators';
+        nav.sidenav.clickNavLink([section, 'Installed Operators']);
+      });
 
-    cy.byTestID('name-filter-input').should('be.visible').type('Observability{enter}');
-    cy.get('[data-test="status-text"]', { timeout: installTimeoutMilliseconds })
-      .eq(0)
-      .should('contain.text', 'Succeeded', { timeout: installTimeoutMilliseconds });
+      cy.byTestID('name-filter-input').should('be.visible').type('Observability{enter}');
+      cy.get('[data-test="status-text"]', { timeout: installTimeoutMilliseconds })
+        .eq(0)
+        .should('contain.text', 'Succeeded', { timeout: installTimeoutMilliseconds });
+    }
   },
 
   cleanupCOONamespace(MCP: { namespace: string }): void {
diff --git a/web/cypress/support/commands/dashboards-commands.ts b/web/cypress/support/commands/dashboards-commands.ts
@@ -1,4 +1,5 @@
 import { DataTestIDs, LegacyTestIDs } from '../../../src/components/data-test';
+import { waitForPodsReady, waitForResourceCondition } from './wait-utils';
 
 export { };
 
@@ -9,16 +10,8 @@ export const dashboardsUtils = {
   setupMonitoringUIPlugin(MCP: { namespace: string }): void {
     cy.log('Create Monitoring UI Plugin instance.');
     cy.exec(`oc apply -f ./cypress/fixtures/coo/monitoring-ui-plugin.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
-    cy.exec(
-      `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/instance=monitoring -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-      {
-        timeout: readyTimeoutMilliseconds,
-        failOnNonZeroExit: true,
-      },
-    ).then((result) => {
-      expect(result.code).to.eq(0);
-      cy.log(`Monitoring plugin pod is now running in namespace: ${MCP.namespace}`);
-    });
+    waitForPodsReady('app.kubernetes.io/instance=monitoring', MCP.namespace, readyTimeoutMilliseconds);
+    cy.log(`Monitoring plugin pod is now running in namespace: ${MCP.namespace}`);
   },
 
   setupDashboardsAndPlugins(MCP: { namespace: string }): void {
@@ -68,27 +61,16 @@ export const dashboardsUtils = {
       `oc label namespace ${MCP.namespace} openshift.io/cluster-monitoring=true --overwrite=true --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
     );
 
-    cy.exec(
-      `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/instance=perses -n ${MCP.namespace} --timeout=600s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-      {
-        timeout: installTimeoutMilliseconds,
-        failOnNonZeroExit: true,
-      },
-    ).then((result) => {
-      expect(result.code).to.eq(0);
-      cy.log(`Perses-0 pod is now running in namespace: ${MCP.namespace}`);
-    });
+    waitForPodsReady('app.kubernetes.io/instance=perses', MCP.namespace, installTimeoutMilliseconds);
+    cy.log(`Perses-0 pod is now running in namespace: ${MCP.namespace}`);
 
-    cy.exec(
-      `sleep 15 && oc wait --for=jsonpath='{.metadata.name}'=health-analyzer --timeout=60s servicemonitor/health-analyzer -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-      {
-        timeout: readyTimeoutMilliseconds,
-        failOnNonZeroExit: true,
-      },
-    ).then((result) => {
-      expect(result.code).to.eq(0);
-      cy.log(`Health-analyzer service monitor is now running in namespace: ${MCP.namespace}`);
-    });
+    waitForResourceCondition(
+      'servicemonitor/health-analyzer',
+      "jsonpath='{.metadata.name}'=health-analyzer",
+      MCP.namespace,
+      readyTimeoutMilliseconds,
+    );
+    cy.log(`Health-analyzer service monitor is now running in namespace: ${MCP.namespace}`);
 
     cy.reload(true);
     cy.visit('/monitoring/v2/dashboards');
@@ -100,34 +82,14 @@ export const dashboardsUtils = {
     cy.exec(`oc apply -f ./cypress/fixtures/coo/troubleshooting-panel-ui-plugin.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
     cy.log('Troubleshooting panel instance created. Waiting for pods to be ready.');
-    cy.exec(
-      `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/instance=troubleshooting-panel -n ${MCP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-      {
-        timeout: readyTimeoutMilliseconds,
-        failOnNonZeroExit: true,
-      },
-    ).then((result) => {
-      expect(result.code).to.eq(0);
-      cy.log(`Troubleshooting panel pod is now running in namespace: ${MCP.namespace}`);
-    });
+    waitForPodsReady('app.kubernetes.io/instance=troubleshooting-panel', MCP.namespace, readyTimeoutMilliseconds);
+    cy.log(`Troubleshooting panel pod is now running in namespace: ${MCP.namespace}`);
+
+    waitForPodsReady('app.kubernetes.io/instance=korrel8r', MCP.namespace, installTimeoutMilliseconds);
+    cy.log(`Korrel8r pod is now running in namespace: ${MCP.namespace}`);
 
-    cy.exec(
-      `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/instance=korrel8r -n ${MCP.namespace} --timeout=600s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-      {
-        timeout: installTimeoutMilliseconds,
-        failOnNonZeroExit: true,
-      },
-    ).then((result) => {
-      expect(result.code).to.eq(0);
-      cy.log(`Korrel8r pod is now running in namespace: ${MCP.namespace}`);
-    });
-
-    cy.log('Reloading the page');
     cy.reload(true);
-    cy.log('Waiting for 10 seconds before clicking the application launcher');
-    cy.wait(10000);
-    cy.log('Clicking the application launcher');
-    cy.byLegacyTestID(LegacyTestIDs.ApplicationLauncher).should('be.visible').click();
+    cy.byLegacyTestID(LegacyTestIDs.ApplicationLauncher, { timeout: 30000 }).should('be.visible').click();
     cy.byTestID(DataTestIDs.MastHeadApplicationItem).contains('Signal Correlation').should('be.visible');
   },
 
diff --git a/web/cypress/support/commands/image-patch-commands.ts b/web/cypress/support/commands/image-patch-commands.ts
@@ -1,3 +1,5 @@
+import { waitForPodsReady, waitForPodsReadyOrAbsent } from './wait-utils';
+
 export { };
 
 const readyTimeoutMilliseconds = Cypress.config('readyTimeoutMilliseconds') as number;
@@ -22,17 +24,9 @@ export const imagePatchUtils = {
         cy.log(`CMO deployment Scaled Down successfully: ${result.stdout}`);
       });
 
-      cy.exec(
-        `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/name=monitoring-plugin -n ${MP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-        {
-          timeout: readyTimeoutMilliseconds,
-          failOnNonZeroExit: true,
-        },
-      ).then((result) => {
-        expect(result.code).to.eq(0);
-        cy.log(`Monitoring plugin pod is now running in namespace: ${MP.namespace}`);
-        cy.reload(true);
-      });
+      waitForPodsReady('app.kubernetes.io/name=monitoring-plugin', MP.namespace, readyTimeoutMilliseconds);
+      cy.log(`Monitoring plugin pod is now running in namespace: ${MP.namespace}`);
+      cy.reload(true);
     } else {
       cy.log('MP_IMAGE is NOT set. Skipping patching the image in CMO operator CSV.');
     }
@@ -106,21 +100,8 @@ export const imagePatchUtils = {
         expect(result.code).to.eq(0);
         cy.log(`CMO CSV reverted successfully with Monitoring Plugin image: ${result.stdout}`);
 
-        cy.exec(
-          `sleep 15 && oc wait --for=condition=Ready pods --selector=app.kubernetes.io/name=monitoring-plugin -n ${MP.namespace} --timeout=60s --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
-          {
-            timeout: readyTimeoutMilliseconds,
-            failOnNonZeroExit: false,
-          },
-        ).then((result) => {
-          if (result.code === 0) {
-            cy.log(`Monitoring plugin pod is now running in namespace: ${MP.namespace}`);
-          } else if (result.stderr.includes('no matching resources found')) {
-            cy.log(`No monitoring-plugin pods found in namespace ${MP.namespace} - this is expected on fresh clusters`);
-          } else {
-            throw new Error(`Failed to wait for monitoring-plugin pods: ${result.stderr}`);
-          }
-        });
+        waitForPodsReadyOrAbsent('app.kubernetes.io/name=monitoring-plugin', MP.namespace, readyTimeoutMilliseconds);
+        cy.log(`Monitoring plugin pods verified in namespace: ${MP.namespace}`);
 
         cy.reload(true);
       });
diff --git a/web/cypress/support/commands/wait-utils.ts b/web/cypress/support/commands/wait-utils.ts
@@ -0,0 +1,96 @@
+import 'cypress-wait-until';
+
+/**
+ * Poll until pods matching a label selector reach the Ready condition.
+ * Replaces the `sleep N && oc wait` anti-pattern — proceeds as soon as
+ * the pod is ready instead of sleeping a fixed duration first.
+ *
+ * Handles the case where pods don't exist yet (oc wait fails immediately
+ * with "no matching resources") by retrying until the overall timeout.
+ */
+export function waitForPodsReady(
+  selector: string,
+  namespace: string,
+  timeoutMs?: number,
+  intervalMs: number = 5000,
+): void {
+  const kubeconfig = Cypress.env('KUBECONFIG_PATH');
+  const timeout = timeoutMs ?? (Cypress.config('readyTimeoutMilliseconds') as number);
+
+  cy.waitUntil(
+    () =>
+      cy
+        .exec(
+          `oc wait --for=condition=Ready pods --selector=${selector} -n ${namespace} --timeout=10s --kubeconfig ${kubeconfig}`,
+          { failOnNonZeroExit: false, timeout: 20000 },
+        )
+        .then((result) => result.code === 0),
+    {
+      timeout,
+      interval: intervalMs,
+      errorMsg: `Pods with selector '${selector}' not ready in '${namespace}' within ${timeout / 1000}s`,
+    },
+  );
+}
+
+/**
+ * Like waitForPodsReady but also accepts "no matching resources found"
+ * as a success condition (useful for optional components on fresh clusters).
+ */
+export function waitForPodsReadyOrAbsent(
+  selector: string,
+  namespace: string,
+  timeoutMs?: number,
+  intervalMs: number = 5000,
+): void {
+  const kubeconfig = Cypress.env('KUBECONFIG_PATH');
+  const timeout = timeoutMs ?? (Cypress.config('readyTimeoutMilliseconds') as number);
+
+  cy.waitUntil(
+    () =>
+      cy
+        .exec(
+          `oc wait --for=condition=Ready pods --selector=${selector} -n ${namespace} --timeout=10s --kubeconfig ${kubeconfig}`,
+          { failOnNonZeroExit: false, timeout: 20000 },
+        )
+        .then(
+          (result) =>
+            result.code === 0 || result.stderr.includes('no matching resources found'),
+        ),
+    {
+      timeout,
+      interval: intervalMs,
+      errorMsg: `Pods with selector '${selector}' neither ready nor absent in '${namespace}' within ${timeout / 1000}s`,
+    },
+  );
+}
+
+/**
+ * Poll until an arbitrary `oc wait` condition is met on a resource.
+ * Useful for non-pod resources like ServiceMonitors.
+ */
+export function waitForResourceCondition(
+  resource: string,
+  condition: string,
+  namespace: string,
+  timeoutMs?: number,
+  intervalMs: number = 5000,
+): void {
+  const kubeconfig = Cypress.env('KUBECONFIG_PATH');
+  const timeout = timeoutMs ?? (Cypress.config('readyTimeoutMilliseconds') as number);
+
+  cy.waitUntil(
+    () =>
+      cy
+        .exec(
+          `oc wait --for=${condition} ${resource} -n ${namespace} --timeout=10s --kubeconfig ${kubeconfig}`,
+          { failOnNonZeroExit: false, timeout: 20000 },
+        )
+        .then((result) => result.code === 0),
+    {
+      timeout,
+      interval: intervalMs,
+      errorMsg: `Condition '${condition}' not met for '${resource}' in '${namespace}' within ${timeout / 1000}s`,
+    },
+  );
+}
