virtualization installation and stabilization of monitoring tests

Author: etmurasaki

web/cypress/README.md

@@ -72,6 +72,33 @@ Set the following var to enable Cypress session management for faster test execu
 export CYPRESS_SESSION=true
 ```
 
+Integration Testing variables
+
+Set the var to skip Openshift Virtualization and all the required operators installation.
+```bash
+export CYPRESS_SKIP_KBV_INSTALL=false
+```
+
+Set the var to install Openshift Virtualization from redhat-operators catalog source.
+```bash
+export CYPRESS_KBV_UI_INSTALL=true
+```
+
+Set the var to install Openshift Virtualization Operator using Konflux bundle.
+```bash
+export CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE=<KBV image>
+```
+
+# Set the var to use custom Openshift Virtualization Operator bundle image
+```bash
+export CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE=<KBV bundle image>
+```
+
+Set the var to use Openshift Virtualization Operator FBC image
+```bash
+export CYPRESS_FBC_STAGE_KBV_IMAGE=<KBV FBC image>
+```
+
 ### Environment Configuration Script
 
 The `configure-env.sh` script provides an interactive way to set up all the required environment variables. This script eliminates the need to manually export each variable and helps find the correct kubeconfig file.
@@ -106,11 +133,22 @@ npx cypress open
 npx cypress run
 ```
 
-To run a specific file
+Some examples to run a specific file(s)
+
+It runs the COO BVT only
 ```bash
 cd monitoring-plugin/web/cypress
-npx cypress run --spec "cypress/e2e/bvt.cy.ts"
-npx cypress run --spec "cypress/e2e/coo_bvt.cy.ts"
+npx cypress run --spec "cypress/e2e/coo/01.coo_bvt.cy.ts"
+```
+
+It runs the Monitoring BVT only
+```bash
+npx cypress run --spec "cypress/e2e/monitoring/01.bvt_monitoring.cy.ts"
+```
+
+It runs the Monitoring Regression tests
+```bash
+npx cypress run --spec "cypress/e2e/monitoring/regression/**"
 ```
 
 ### Testing recording

web/cypress/configure-env.sh

@@ -174,6 +174,11 @@ print_current_config() {
   print_var "CYPRESS_MCP_CONSOLE_IMAGE" "${CYPRESS_MCP_CONSOLE_IMAGE-}"
   print_var "CYPRESS_TIMEZONE" "${CYPRESS_TIMEZONE-}"
   print_var "CYPRESS_SESSION" "${CYPRESS_SESSION-}"
+  print_var "CYPRESS_SKIP_KBV_INSTALL" "${CYPRESS_SKIP_KBV_INSTALL-}"
+  print_var "CYPRESS_KBV_UI_INSTALL" "${CYPRESS_KBV_UI_INSTALL-}"
+  print_var "CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE" "${CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE-}"
+  print_var "CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE" "${CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE-}"
+  print_var "CYPRESS_FBC_STAGE_KBV_IMAGE" "${CYPRESS_FBC_STAGE_KBV_IMAGE-}"
 }
 
 main() {
@@ -216,7 +221,11 @@ main() {
   local def_mcp_console_image=${CYPRESS_MCP_CONSOLE_IMAGE-}
   local def_timezone=${CYPRESS_TIMEZONE-}
   local def_session=${CYPRESS_SESSION-}
-
+  local def_skip_kbv=${CYPRESS_SKIP_KBV_INSTALL-}
+  local def_kbv_ui_install=${CYPRESS_KBV_UI_INSTALL-}
+  local def_konflux_kbv_bundle=${CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE-}
+  local def_custom_kbv_bundle=${CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE-}
+  local def_fbc_stage_kbv_image=${CYPRESS_FBC_STAGE_KBV_IMAGE-}
   # Required basics
   local base_url
   while true; do
@@ -412,6 +421,26 @@ main() {
   local session="false"
   [[ "$session_ans" == "y" ]] && session="true"
 
+  local skip_kbv_install_ans
+  skip_kbv_install_ans=$(ask_yes_no "Skip Openshift Virtualization installation? (sets CYPRESS_SKIP_KBV_INSTALL)" "$(bool_to_default_yn "$def_skip_kbv")")
+  local skip_kbv_install="false"
+  [[ "$skip_kbv_install_ans" == "y" ]] && skip_kbv_install="true"
+
+  local kbv_ui_install_ans
+  kbv_ui_install_ans=$(ask_yes_no "Install KBV from redhat-operators? (sets CYPRESS_KBV_UI_INSTALL)" "$(bool_to_default_yn "$def_kbv_ui_install")")
+  local kbv_ui_install="false"
+  [[ "$kbv_ui_install_ans" == "y" ]] && kbv_ui_install="true"
+  
+  local konflux_kbv_bundle
+  konflux_kbv_bundle=$(ask "Konflux KBV bundle image (CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE)" "$def_konflux_kbv_bundle")
+  
+  local custom_kbv_bundle
+  custom_kbv_bundle=$(ask "Custom KBV bundle image (CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE)" "$def_custom_kbv_bundle")
+  
+  local fbc_stage_kbv_image
+  fbc_stage_kbv_image=$(ask "KBV FBC image (CYPRESS_FBC_STAGE_KBV_IMAGE)" "$def_fbc_stage_kbv_image")
+  
+
   # Build export lines with safe quoting
   local -a export_lines
   export_lines+=("export CYPRESS_BASE_URL='$(printf %s "$base_url" | escape_for_single_quotes)'" )
@@ -437,6 +466,22 @@ main() {
   fi
   export_lines+=("export CYPRESS_SESSION='$(printf %s "$session" | escape_for_single_quotes)'" )
 
+  if [[ -n "$skip_kbv_install" ]]; then
+    export_lines+=("export CYPRESS_SKIP_KBV_INSTALL='$(printf %s "$skip_kbv_install" | escape_for_single_quotes)'" )
+  fi
+  if [[ -n "$kbv_ui_install" ]]; then
+    export_lines+=("export CYPRESS_KBV_UI_INSTALL='$(printf %s "$kbv_ui_install" | escape_for_single_quotes)'" )
+  fi
+  if [[ -n "$konflux_kbv_bundle" ]]; then
+    export_lines+=("export CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE='$(printf %s "$konflux_kbv_bundle" | escape_for_single_quotes)'" )
+  fi
+  if [[ -n "$custom_kbv_bundle" ]]; then
+    export_lines+=("export CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE='$(printf %s "$custom_kbv_bundle" | escape_for_single_quotes)'" )
+  fi
+  if [[ -n "$fbc_stage_kbv_image" ]]; then
+    export_lines+=("export CYPRESS_FBC_STAGE_KBV_IMAGE='$(printf %s "$fbc_stage_kbv_image" | escape_for_single_quotes)'" )
+  fi
+
   echo ""
   if is_sourced; then
     # Export directly into current shell
@@ -467,6 +512,11 @@ main() {
   [[ -n "${CYPRESS_MCP_CONSOLE_IMAGE-}$mcp_console_image" ]] && echo "  CYPRESS_MCP_CONSOLE_IMAGE=${CYPRESS_MCP_CONSOLE_IMAGE:-$mcp_console_image}"
   [[ -n "${CYPRESS_TIMEZONE-}$timezone" ]] && echo "  CYPRESS_TIMEZONE=${CYPRESS_TIMEZONE:-$timezone}"
   echo "  CYPRESS_SESSION=${CYPRESS_SESSION:-$session}"
+  echo "  CYPRESS_SKIP_KBV_INSTALL=${CYPRESS_SKIP_KBV_INSTALL:-$skip_kbv_install}"
+  echo "  CYPRESS_KBV_UI_INSTALL=${CYPRESS_KBV_UI_INSTALL:-$kbv_ui_install}"
+  [[ -n "${CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE-}$konflux_kbv_bundle" ]] && echo "  CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE=${CYPRESS_KONFLUX_KBV_BUNDLE_IMAGE:-$konflux_kbv_bundle}"
+  [[ -n "${CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE-}$custom_kbv_bundle" ]] && echo "  CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE=${CYPRESS_CUSTOM_KBV_BUNDLE_IMAGE:-$custom_kbv_bundle}"
+  [[ -n "${CYPRESS_FBC_STAGE_KBV_IMAGE-}$fbc_stage_kbv_image" ]] && echo "  CYPRESS_FBC_STAGE_KBV_IMAGE=${CYPRESS_FBC_STAGE_KBV_IMAGE:-$fbc_stage_kbv_image}"
 }
 
 main "$@"

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

@@ -0,0 +1,63 @@
+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.0',
+  config: {
+    kind: 'HyperConverged',
+    name: 'kubevirt-hyperconverged',
+  },
+  crd: {
+    kubevirt: 'kubevirts.kubevirt.io',
+    hyperconverged: 'hyperconvergeds.hco.kubevirt.io',
+  }
+};
+
+const MCP = {
+  namespace: 'openshift-cluster-observability-operator',
+  packageName: 'cluster-observability-operator',
+  operatorName: 'Cluster Observability Operator',
+  config: {
+    kind: 'UIPlugin',
+    name: 'monitoring',
+  },
+};
+
+const MP = {
+  namespace: 'openshift-monitoring',
+  operatorName: 'Cluster Monitoring Operator',
+};
+
+describe('IVT: Monitoring UIPlugin + Virtualization', () => {
+
+  before(() => {
+    cy.beforeBlockVirtualization(KBV);
+    cy.beforeBlockCOO(MCP, MP);
+  });
+
+  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();
+    nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+    commonPages.titleShouldHaveText('Alerting');
+    nav.tabs.switchTab('Silences');
+    nav.tabs.switchTab('Alerting rules');
+    cy.get(Classes.HorizontalNav).contains('Incidents').should('not.exist');
+    nav.sidenav.clickNavLink(['Observe', 'Dashboards (Perses)']);
+    commonPages.titleShouldHaveText('Dashboards');
+    cy.switchPerspective('Administrator');
+
+  });
+
+  /**
+   * TODO: To be replaced by COO validation such as Dashboards (Perses) scenarios
+   */
+
+});

web/cypress/e2e/monitoring/01.bvt_monitoring.cy.ts

@@ -10,6 +10,7 @@ import { overviewPage } from '../../views/overview-page';
 import common = require('mocha/lib/interfaces/common');
 import { AlertsAlertState, SilenceComment, SilenceState, WatchdogAlert } from '../../fixtures/monitoring/constants';
 import { alerts } from '../../fixtures/monitoring/alert';
+import { alertingRuleListPage } from '../../views/alerting-rule-list-page';
 // Set constants for the operators that need to be installed for tests.
 const MP = {
   namespace: 'openshift-monitoring',
@@ -29,6 +30,7 @@ describe('BVT: Monitoring', () => {
     commonPages.detailsPage.administration_clusterSettings();
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     commonPages.titleShouldHaveText('Alerting');
+    cy.changeNamespace('All Projects');
     nav.tabs.switchTab('Silences');
     silencesListPage.firstTimeEmptyState();
     nav.sidenav.clickNavLink(['Observe', 'Metrics']);
@@ -71,6 +73,7 @@ describe('BVT: Monitoring', () => {
     nav.sidenav.clickNavLink(['Home', 'Overview']);
     overviewPage.clickClusterUtilizationViewCPU();
     commonPages.titleShouldHaveText('Metrics');
+    commonPages.projectDropdownShouldExist();
   });
 
 
@@ -79,7 +82,6 @@ describe('BVT: Monitoring', () => {
     cy.log('5.1. use sidebar nav to go to Observe > Alerting');
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     commonPages.titleShouldHaveText('Alerting');
-    commonPages.projectDropdownShouldNotExist();
     listPage.tabShouldHaveText('Alerts');
     listPage.tabShouldHaveText('Silences');
     listPage.tabShouldHaveText('Alerting rules');
@@ -206,6 +208,12 @@ describe('BVT: Monitoring', () => {
     listPage.filter.selectFilterOption(false, SilenceState.ACTIVE, true);
     silencesListPage.rows.shouldBe(`${WatchdogAlert.ALERTNAME}`, SilenceState.ACTIVE);
 
+    cy.log('6.9.1 verify on Alerting Rules list page again');
+    nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+    nav.tabs.switchTab('Alerting rules');
+    listPage.filter.byName(`${WatchdogAlert.ALERTNAME}`);
+    alertingRuleListPage.ARShouldBe(`${WatchdogAlert.ALERTNAME}`, `${WatchdogAlert.SEVERITY}`, 1, AlertsAlertState.SILENCED);
+
     cy.log('6.10 verify on Alerts list page again');
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     listPage.filter.clearAllFilters();
@@ -216,7 +224,9 @@ describe('BVT: Monitoring', () => {
     cy.log('6.11 expires the Silence');
     listPage.ARRows.expandRow();
     listPage.ARRows.clickAlert();
-    detailsPage.expireSilence(true);
+    detailsPage.clickOnSilencedBy(`${WatchdogAlert.ALERTNAME}`);
+    silenceDetailsPage.expireSilence(true, true);
+
 
     cy.log('6.12 verify on Alerts list page again');
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);

web/cypress/e2e/monitoring/regression/01.reg_alerts.cy.ts

@@ -26,9 +26,10 @@ describe('Regression: Monitoring - Alerts', () => {
 
   it('1. Admin perspective - Alerting > Alerts page - Filtering', () => {
     cy.log('1.1 Header components');
+    
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     alerts.getWatchdogAlert();
-
+    cy.changeNamespace("All Projects");
     listPage.filter.selectFilterOption(true, AlertingRulesAlertState.PENDING, false);
     listPage.filter.selectFilterOption(false, AlertingRulesAlertState.SILENCED, false);
     listPage.filter.selectFilterOption(false, Severity.CRITICAL, false);
@@ -78,14 +79,12 @@ describe('Regression: Monitoring - Alerts', () => {
     cy.log('3.1 use sidebar nav to go to Observe > Alerting');
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     alerts.getWatchdogAlert();
-
     listPage.ARRows.shouldBeLoaded();
 
     cy.log('3.2 filter to Watchdog alert');
     listPage.filter.byName(`${WatchdogAlert.ALERTNAME}`);
     listPage.ARRows.countShouldBe(1);
 
-
     cy.log('3.3 silence alert');
     listPage.ARRows.expandRow();
     listPage.ARRows.silenceAlert();
@@ -124,14 +123,14 @@ describe('Regression: Monitoring - Alerts', () => {
     commonPages.titleShouldHaveText(`${WatchdogAlert.ALERTNAME}`);
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
     nav.tabs.switchTab('Silences');
+    cy.changeNamespace('openshift-monitoring');
 
     cy.log('3.8 Assert Kebab on Silence List page for Expired alert');
     silencesListPage.emptyState();
     listPage.filter.removeMainTag(MainTagState.SILENCE_STATE);
     listPage.filter.selectFilterOption(true, SilenceState.EXPIRED, false);
     listPage.filter.selectFilterOption(false, SilenceState.ACTIVE, false);
     listPage.filter.selectFilterOption(false, SilenceState.PENDING, true);
-    silencesListPage.filter.byName(`${WatchdogAlert.ALERTNAME}`);
     silencesListPage.rows.assertExpiredAlertKebab('0');
 
     cy.log('3.9 Click on Expired alert and Assert Actions button');
@@ -194,6 +193,7 @@ describe('Regression: Monitoring - Alerts', () => {
     silenceAlertPage.clickCancelButton();
     commonPages.titleShouldHaveText(`${WatchdogAlert.ALERTNAME}`);
     nav.sidenav.clickNavLink(['Observe', 'Alerting']);
+    listPage.filter.byName(`${WatchdogAlert.ALERTNAME}`);
     listPage.ARRows.countShouldBe(1);
   });