Merge pull request #601 from DavidRajnoha/cypress-tags

OBSINTA-857: implement grep tags for selective test execution

Author: openshift-merge-bot[bot]

web/cypress.config.ts

@@ -2,6 +2,7 @@ import { defineConfig } from 'cypress';
 import * as fs from 'fs-extra';
 import * as console from 'console';
 import * as path from 'path';
+import registerCypressGrep from '@cypress/grep/src/plugin';
 
 export default defineConfig({
   screenshotsFolder: './cypress/screenshots',
@@ -39,6 +40,8 @@ export default defineConfig({
     viewportWidth: 1920,
     viewportHeight: 1080,
     setupNodeEvents(on, config) {
+      registerCypressGrep(config);
+      
       on(
         'before:browser:launch',
         (

web/cypress/README.md

@@ -236,6 +236,90 @@ npm run cypress:run --spec "cypress/e2e/**/incidents*.cy.ts"
 
 ---
 
+### Running tests by tags
+
+Tests are organized using tags for selective execution using [@cypress/grep](https://github.com/cypress-io/cypress/tree/develop/npm/grep).
+
+#### Tag Categories
+
+**1. Basic Tags:**
+- `@smoke` - Fast BVT tests
+- `@demo` - Interactive demo tests (no assertions, skipped in CI)
+- `@flaky` - Tests that don't pass reliably
+- `@xfail` - Tests for known bugs expected to fail
+- `@slow` - Long-running e2e tests (15+ minutes)
+
+**2. High-Level Component Tags:**
+- `@monitoring` - Monitoring plugin tests
+- `@incidents` - Incidents feature tests
+- `@coo` - Cluster Observability Operator functionality tests (operator installation, ACM integration)
+- `@virtualization` - Virtualization integration tests
+- `@alerts` - Alert-related tests
+- `@metrics` - Metrics-related tests
+- `@dashboards` - Dashboard-related tests (includes Perses)
+
+**3. Specific Feature Tags** (format: `@{component}-{label}`):
+- Example: `@incidents-redux`
+- Add specific feature tags as needed
+
+**4. JIRA Tags** (format: `@JIRA-{ID}`):
+- Example: `@JIRA-OU-1033`
+- Link tests to specific JIRA issues
+
+#### Running Tests by Tags
+
+**Run smoke tests (BVT):**
+```bash
+npx cypress run --env grepTags=@smoke
+# or
+npm run test-cypress-smoke
+```
+
+**Run regression tests (all non-smoke tests):**
+```bash
+npx cypress run --env grepTags="-@smoke -@flaky -@demo"
+```
+
+**Run component-specific tests:**
+```bash
+npm run test-cypress-monitoring       # All monitoring tests
+npm run test-cypress-incidents        # All incidents tests
+npm run test-cypress-coo              # COO operator functionality tests
+npm run test-cypress-virtualization   # All virtualization integration tests
+npm run test-cypress-alerts           # All alerts tests
+npm run test-cypress-metrics          # All metrics tests
+npm run test-cypress-dashboards       # All dashboards tests (includes Perses)
+```
+
+**Run smoke tests for specific component:**
+```bash
+npm run test-cypress-monitoring-bvt  # Monitoring smoke tests
+npm run test-cypress-coo-bvt         # COO smoke tests
+```
+
+**Run regression for specific component:**
+```bash
+npm run test-cypress-monitoring-regression  # All monitoring except smoke
+```
+
+**Run tests with multiple tags (OR logic):**
+```bash
+npx cypress run --env grepTags="@smoke @slow"
+```
+
+**Run tests with BOTH tags (AND logic):**
+```bash
+npx cypress run --env grepTags="@smoke+@incidents"
+```
+
+**Complex filtering:**
+```bash
+npx cypress run --env grepTags="@incidents -@slow -@flaky"
+```
+
+---
+
+
 ## Test Results
 
 ### Videos

web/cypress/e2e/coo/01.coo_bvt.cy.ts

@@ -18,7 +18,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('BVT: COO', () => {
+describe('BVT: COO', { tags: ['@smoke', '@coo'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

web/cypress/e2e/coo/01.coo_ivt.cy.ts

@@ -0,0 +1,40 @@
+import { Classes } from '../../../src/components/data-test';
+import { commonPages } from '../../views/common';
+import { nav } from '../../views/nav';
+import { guidedTour } from '../../views/tour';
+
+// Set constants for the operators that need to be installed for tests.
+const KBV = {
+  namespace: 'openshift-cnv',
+  packageName: 'kubevirt-hyperconverged',
+  operatorName: 'kubevirt-hyperconverged-operator.v4.19.6',
+  config: {
+    kind: 'HyperConverged',
+    name: 'kubevirt-hyperconverged',
+  },
+  crd: {
+    kubevirt: 'kubevirts.kubevirt.io',
+    hyperconverged: 'hyperconvergeds.hco.kubevirt.io',
+  }
+};
+
+describe('IVT: Monitoring UIPlugin + Virtualization', { tags: ['@smoke', '@coo'] }, () => {
+
+  before(() => {
+    cy.beforeBlockVirtualization(KBV);
+  });
+
+  it('1. Virtualization perspective - Observe Menu', () => {
+    cy.log('Virtualization perspective - Observe Menu and verify all submenus');
+    cy.switchPerspective('Virtualization');
+    cy.byAriaLabel('Welcome modal').should('be.visible');
+    guidedTour.closeKubevirtTour();
+    cy.switchPerspective('Administrator');
+
+  });
+
+  /**
+   * TODO: To be replaced by COO validation such as Dashboards (Perses) scenarios
+   */
+
+});

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

@@ -19,7 +19,7 @@ const MP = {
 };
 const expectedAlerts = ['Watchdog', 'Watchdog-spoke', 'ClusterCPUHealth-jb'];
 
-describe('ACM Alerting UI', () => {
+describe('ACM Alerting UI', { tags: ['@coo', '@alerts'] }, () => {
   before(() => {
     cy.beforeBlockACM(MCP, MP);
   });

web/cypress/e2e/incidents/00.coo_incidents_e2e.cy.ts

@@ -21,7 +21,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('BVT: Incidents - e2e', () => {
+describe('BVT: Incidents - e2e', { tags: ['@smoke', '@slow', '@incidents'] }, () => {
   let currentAlertName: string;
 
   before(() => {

web/cypress/e2e/incidents/01.incidents.cy.ts

@@ -31,7 +31,7 @@ const NAMESPACE = 'openshift-monitoring';
 const SEVERITY = 'Critical';
 const ALERT_DESC = 'This is an alert meant to ensure that the entire alerting pipeline is functional. This alert is always firing, therefore it should always be firing in Alertmanager and always fire against a receiver. There are integrations with various notification mechanisms that send a notification when this alert is not firing. For example the "DeadMansSnitch" integration in PagerDuty.'
 const ALERT_SUMMARY = 'An alert that should always be firing to certify that Alertmanager is working properly.'
-describe('BVT: Incidents - UI', () => {
+describe('BVT: Incidents - UI', { tags: ['@smoke', '@incidents'] }, () => {
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
   });

web/cypress/e2e/incidents/02.incidents-mocking-example.cy.ts

@@ -26,7 +26,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('Incidents - Mocking Examples', () => {
+describe('Incidents - Mocking Examples', { tags: ['@demo', '@incidents'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);
@@ -37,37 +37,45 @@ describe('Incidents - Mocking Examples', () => {
     incidentsPage.goTo();
   });
 
-  it('1. Mock healthy cluster from fixture', () => {
+  it('1. Mock silenced and firing incidents with mixed severity', () => {
+    cy.log('Setting up silenced critical and firing warning incidents');
+    cy.mockIncidentFixture('incident-scenarios/silenced-and-firing-mixed-severity.yaml');
+    
+    cy.log('One silenced critical incident (resolved) and one firing warning incident should be visible');
+    cy.pause();
+  });
+
+  it('2. Mock healthy cluster from fixture', () => {
     cy.log('Setting up healthy cluster scenario from fixture');
     cy.mockIncidentFixture('incident-scenarios/0-healthy-cluster.yaml');
 
     cy.pause();
   });
 
-  it('2. Mock single incident with critical and warning alerts', () => {
+  it('3. Mock single incident with critical and warning alerts', () => {
     cy.log('Setting up single incident with critical and warning alerts from fixture');
     cy.mockIncidentFixture('incident-scenarios/1-single-incident-firing-critical-and-warning-alerts.yaml');
     cy.log('Single incident with mixed severity alerts should be visible');
     cy.pause();
   });
 
-  it('3. Mock multi-incidents with resolved and firing alerts', () => {
+  it('4. Mock multi-incidents with resolved and firing alerts', () => {
     cy.log('Setting up multi-incidents with resolved and firing alerts from fixture');
     cy.mockIncidentFixture('incident-scenarios/2-multi-incidents-multi-alerts-resolved-and-firing.yaml');
 
     cy.log('Multiple incidents with mixed alert states should be visible');
     cy.pause();
   });
 
-  it('4. Mock multi-severity overlapping incidents', () => {
+  it('5. Mock multi-severity overlapping incidents', () => {
     cy.log('Setting up multi-severity overlapping incidents from fixture');
     cy.mockIncidentFixture('incident-scenarios/3-multi-severity-overlapping-incidents.yaml');
 
     cy.log('Overlapping incidents with different severity distributions should be visible');
     cy.pause();
   });
 
-  it('5. Mock single incident with escalating severity alerts', () => {
+  it('6. Mock single incident with escalating severity alerts', () => {
     cy.log('Setting up single incident with escalating severity alerts from fixture');
     cy.mockIncidentFixture('incident-scenarios/5-escalating-severity-incident.yaml');
 
@@ -76,7 +84,7 @@ describe('Incidents - Mocking Examples', () => {
 
   });
 
-  it('6. Mock empty incident state', () => {
+  it('7. Mock empty incident state', () => {
     cy.log('Setting up empty incident state');
     cy.mockIncidents([]);
 

web/cypress/e2e/incidents/regression/01.reg_filtering.cy.ts

@@ -25,7 +25,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('Regression: Incidents Filtering', () => {
+describe('Regression: Incidents Filtering', { tags: ['@incidents'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);

web/cypress/e2e/incidents/regression/02.reg_ui_charts_comprehensive.cy.ts

@@ -84,7 +84,7 @@ const MP = {
   operatorName: 'Cluster Monitoring Operator',
 };
 
-describe('Regression: Charts UI - Comprehensive', () => {
+describe('Regression: Charts UI - Comprehensive', { tags: ['@incidents'] }, () => {
 
   before(() => {
     cy.beforeBlockCOO(MCP, MP);