enhance install & remove after

Author: Tai-RedHat

web/cypress/e2e/coo/02.acm_alerting_ui.cy.ts

@@ -1,8 +1,5 @@
 // 02.acm_alerting_ui.cy.ts
 // E2E test for validating ACM Alerting UI integration with Cluster Observability Operator (COO)
-import { commonPages } from '../../views/common';
-import { nav } from '../../views/nav';
-
 const MCP = {
   namespace: 'openshift-cluster-observability-operator',
   packageName: 'cluster-observability-operator',
@@ -12,12 +9,10 @@ const MCP = {
     name: 'monitoring',
   },
 };
-
 const MP = {
   namespace: 'openshift-monitoring',
   operatorName: 'Cluster Monitoring Operator',
 };
-
 const expectedAlerts = ['Watchdog', 'Watchdog-spoke', 'ClusterCPUHealth-jb'];
 
 // ignore error message
@@ -26,27 +21,18 @@ Cypress.on('uncaught:exception', (err) => {
     'Unauthorized',
     "Cannot read properties of null (reading 'default')",
     'ResizeObserver loop limit exceeded',
+    'Bad Gateway',
+    '(intermediate value) is not a function',
   ];
   if (ignoreList.some((txt) => err.message.includes(txt))) {
-    console.warn('⚠️ Ignored frontend exception:', err.message);
+    console.warn('Ignored frontend exception:', err.message);
     return false;
   }
 });
 
 describe('ACM Alerting UI', () => {
   before(() => {
-    cy.beforeBlockCOO(MCP, MP);
-    cy.log('=== [Setup] Installing ACM operator and MultiCluster Observability ===');
-    // install acm through shell script
-    cy.exec('bash ./cypress/fixtures/coo/acm-install.sh', {
-      env: { KUBECONFIG: Cypress.env('KUBECONFIG_PATH'), },
-      failOnNonZeroExit: false,
-      timeout: 1200000, // long time script
-    });
-    // update UIPlugin with the acm related content, (OCP enabled since installed from operatorHub)
-    cy.exec(`oc apply -f ./cypress/fixtures/coo/acm-uiplugin.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
-    // add thanos-ruler-custom-rules
-    cy.exec(`oc apply -f ./cypress/fixtures/coo/acm-alerrule-test.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+    cy.beforeBlockACM(MCP, MP);
   });
 
   it('Navigate to Fleet Management > local-cluster > Observe > Alerting', () => {
@@ -61,52 +47,29 @@ describe('ACM Alerting UI', () => {
       .contains('Fleet Management')
       .should('be.visible')
       .click();
-
     // close pop-up window
-    cy.get('body').then(($body) => {
-      const modalCloseBtn = $body.find('button[data-ouia-component-id="clustersOnboardingModal-ModalBoxCloseButton"]');
-      if (modalCloseBtn.length > 0) {
-        cy.wrap(modalCloseBtn)
-          .should('be.visible')
-          .should('not.be.disabled')
-          .click({ force: true });
-        cy.log('✅ Closed onboarding modal');
-      } else {
-        cy.log('ℹ️ No onboarding modal found');
-      }
-    });
-
+    cy.closeOnboardingModalIfPresent();
     // click “local-cluster” when visible
-    cy.contains('a', 'local-cluster', { timeout: 90000 })
+    cy.log('Waiting for local-cluster link to appear...');
+    cy.contains('local-cluster', { timeout: 120000 })
+      .should('exist')
       .should('be.visible')
-      .should('not.be.disabled')
-      .click({ force: true });
-
+      .then(($el) => {
+        cy.wrap($el).click({ force: true });
+      });
     // click side menu -> Observe -> Alerting
     cy.contains('Observe', { timeout: 20000 }).should('be.visible').click();
     cy.contains('Alerting', { timeout: 20000 }).should('be.visible').click();
-
     // Wait for alert tab content to become visible
     cy.get('section#alerts-tab-content', { timeout: 60000 })
       .should('be.visible');
-
     // confirm Alerting page loading completed then check three alert exist
     cy.get('body', { timeout: 60000 }).should('contain.text', 'Alerting');
     expectedAlerts.forEach((alert) => {
       cy.contains('a[data-test-id="alert-resource-link"]', alert, { timeout: 60000 })
         .should('be.visible');
     });
-
-    cy.log('✅ Verified all expected alerts are visible on the Alerting page');
-    cy.log('✅ ACM Alerting UI test completed successfully');
-  });
-
-  after(() => {
-    cy.log('=== [Teardown] Uninstalling ACM operator and cleaning up ===');
-    cy.exec('bash ./cypress/fixtures/coo/acm-uninstall.sh', {
-      env: { KUBECONFIG: Cypress.env('KUBECONFIG_PATH') },
-      failOnNonZeroExit: false,
-      timeout: 600000,
-    });
+    cy.log('Verified all expected alerts are visible on the Alerting page');
+    cy.log('ACM Alerting UI test completed successfully');
   });
 });

web/cypress/fixtures/coo/acm-uninstall.sh

@@ -1,4 +1,5 @@
 #!/bin/bash
+# this scrpit use to uninstall ACM test resources and do not excute automatlly with test
 set -eux
 echo "[ACM Uninstall] Using KUBECONFIG=${KUBECONFIG:-~/.kube/config}"
 
@@ -19,7 +20,7 @@ oc delete MultiClusterHub multiclusterhub -n open-cluster-management --ignore-no
 
 # wait for MultiClusterHub deleted
 echo "[ACM Uninstall] Waiting for MultiClusterHub cleanup..."
-oc wait MultiClusterHub multiclusterhub -n open-cluster-management --for=delete --timeout=180s || true
+oc wait MultiClusterHub multiclusterhub -n open-cluster-management --for=delete --timeout=300s || true
 
 # --- Step 4: delete Subscription and OperatorGroup ---
 echo "[ACM Uninstall] Deleting ACM Operator Subscription & OperatorGroup..."

web/cypress/support/commands/operator-commands.ts

@@ -20,6 +20,8 @@ declare global {
         cleanupCOO(MCP: { namespace: string, operatorName: string, packageName: string }, MP: { namespace: string, operatorName: string});
         RemoveClusterAdminRole();
         setupCOO(MCP: { namespace: string, operatorName: string, packageName: string }, MP: { namespace: string, operatorName: string });
+        beforeBlockACM( MCP: { namespace: string; operatorName: string; packageName: string }, MP: { namespace: string; operatorName: string },): Chainable<void>;
+        closeOnboardingModalIfPresent(): Chainable<void>;
       }
     }
   }
@@ -567,4 +569,36 @@ Cypress.Commands.add('beforeBlock', (MP: { namespace: string, operatorName: stri
     cy.log('Remove cluster-admin role from user.');
     operatorUtils.RemoveClusterAdminRole();
     cy.log('Remove cluster-admin role from user completed');
-  });
+  });
+
+Cypress.Commands.add('beforeBlockACM', (MCP, MP) => {
+  cy.beforeBlockCOO(MCP, MP);
+  cy.log('=== [Setup] Installing ACM Operator & MCO ===');
+  cy.exec('bash ./cypress/fixtures/coo/acm-install.sh', {
+    env: { KUBECONFIG: Cypress.env('KUBECONFIG_PATH'), },
+    failOnNonZeroExit: false,
+    timeout: 1200000, // long time script
+  });
+  cy.exec(`oc apply -f ./cypress/fixtures/coo/acm-uiplugin.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+  cy.exec(`oc apply -f ./cypress/fixtures/coo/acm-alerrule-test.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+  cy.log('ACM environment setup completed');
+});
+
+Cypress.Commands.add('closeOnboardingModalIfPresent', () => {
+  cy.get('body').then(($body) => {
+    const modalSelector = 'button[data-ouia-component-id="clustersOnboardingModal-ModalBoxCloseButton"]';
+    if ($body.find(modalSelector).length > 0) {
+      cy.log('Onboarding modal detected, attempting to close...');
+      cy.get(modalSelector, { timeout: 20000 })
+        .should('be.visible')
+        .should('not.be.disabled')
+        .click({ force: true });
+
+      cy.get(modalSelector, { timeout: 10000 })
+        .should('not.exist')
+        .then(() => cy.log('Modal successfully closed'));
+    } else {
+      cy.log('No onboarding modal found');
+    }
+  });
+});