fix and cleanup

Author: etmurasaki

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

@@ -19,6 +19,7 @@ const MP = {
 describe('BVT: Monitoring', () => {
 
   before(() => {
+    cy.afterBlock(MP);
     cy.beforeBlock(MP);
   });
 

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

@@ -21,6 +21,7 @@ const MP = {
 describe('Regression: Monitoring - Alerts', () => {
 
   before(() => {
+    cy.afterBlock(MP);
     cy.beforeBlock(MP);
   });
 

web/cypress/e2e/monitoring/regression/02.reg_metrics.cy.ts

@@ -12,6 +12,7 @@ const MP = {
 describe('Regression: Monitoring - Metrics', () => {
 
   before(() => {
+    cy.afterBlock(MP);
     cy.beforeBlock(MP);
   });
 

web/cypress/e2e/monitoring/regression/03.reg_legacy_dashboards.cy.ts

@@ -16,6 +16,7 @@ const MP = {
 describe('Regression: Monitoring - Dashboards (Legacy)', () => {
 
   before(() => {
+    cy.afterBlock(MP);
     cy.beforeBlock(MP);
   });
 

web/cypress/fixtures/cmo/reenable-monitoring.sh

@@ -5,6 +5,6 @@ kubectl scale --replicas=2 -n "${MP_NAMESPACE}" deployment/cluster-monitoring-op
 kubectl scale --replicas=2 -n "${MP_NAMESPACE}" deployment/monitoring-plugin
 
 # Wait for the operator to reconcile the change and make sure all the pods are running.
-sleep 5
+sleep 30
 oc wait --for=condition=Ready pods --selector=app.kubernetes.io/part-of=monitoring-plugin -n "${MP_NAMESPACE}" --timeout=60s
 oc wait --for=condition=ready pods -l app.kubernetes.io/name=cluster-monitoring-operator -n "${MP_NAMESPACE}" --timeout=60s --kubeconfig "${KUBECONFIG}"

web/cypress/fixtures/cmo/update-monitoring-plugin-image.sh

@@ -9,11 +9,11 @@ oc project --namespace="${MP_NAMESPACE}"
 
 oc get deployment "${CMO_CSV_NAME}" -n "${MP_NAMESPACE}" -o yaml > "${RANDOM_FILE}" --kubeconfig "${KUBECONFIG}"
 
-# Patch the CSV file env vars
+# Patch the deployment file related images
 sed -i "s#value: .*monitoring-plugin.*#value: ${MP_IMAGE}#g" "${RANDOM_FILE}"
+sed -i "s#^\([[:space:]]*- -images=monitoring-plugin=\).*#\1${MP_IMAGE}#g" "${RANDOM_FILE}"
 
-# Patch the CSV file related images
-sed -i "s#^\([[:space:]]*- image:\).*monitoring-plugin.*#\1 ${MP_IMAGE}#g" "${RANDOM_FILE}"
+oc replace -f "${RANDOM_FILE}" --kubeconfig "${KUBECONFIG}"
 
 # Scale down
 oc patch clusterversion version --type json -p "$(cat disable-monitoring.yaml)"
@@ -22,7 +22,7 @@ oc scale --replicas=0 -n "${MP_NAMESPACE}" deployment/cluster-monitoring-operato
 
 oc scale --replicas=0 -n "${MP_NAMESPACE}" deployment/monitoring-plugin
 
-# Apply the patched CSV resource file
+# Apply the patched deployment resource file
 oc replace -f "${RANDOM_FILE}" --kubeconfig "${KUBECONFIG}"
 
 # Scale up the Monitoring-plugin
@@ -31,7 +31,7 @@ oc scale --replicas=1 -n "${MP_NAMESPACE}" deployment/cluster-monitoring-operato
 oc scale --replicas=1 -n "${MP_NAMESPACE}" deployment/monitoring-plugin
 
 # Wait for the operator to reconcile the change and make sure all the pods are running.
-sleep 25
+sleep 30
 OUTPUT=`oc wait --for=condition=Ready pods --selector=app.kubernetes.io/part-of=monitoring-plugin -n "${MP_NAMESPACE}" --timeout=60s`
 echo "${OUTPUT}"
 OUTPUT=`oc wait --for=condition=ready pods -l app.kubernetes.io/name=cluster-monitoring-operator -n "${MP_NAMESPACE}" --timeout=60s --kubeconfig "${KUBECONFIG}"`

web/cypress/fixtures/coo/thanos-querier-datasource.yaml

@@ -2,7 +2,7 @@ apiVersion: perses.dev/v1alpha1
 kind: PersesDatasource
 metadata:
   name: thanos-querier-datasource
-  namespace: openshift-cluster-observability-operator
+  namespace: perses-dev
 spec:
   config:
     display:

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

@@ -78,7 +78,7 @@ const operatorUtils = {
       ).then((result) => {
         expect(result.code).to.eq(0);
         cy.log(`CMO CSV updated successfully with Monitoring Plugin image: ${result.stdout}`);
-        cy.reload();
+        cy.reload(true);
       });
     } else {
       cy.log('MP_IMAGE is NOT set. Skipping patching the image in CMO operator CSV.');
@@ -189,7 +189,7 @@ const operatorUtils = {
       ).then((result) => {
         expect(result.code).to.eq(0);
         cy.log(`COO CSV updated successfully with Monitoring Console Plugin image: ${result.stdout}`);
-        cy.reload();
+        cy.reload(true);
       });
     } else {
       cy.log('MCP_CONSOLE_IMAGE is NOT set. Skipping patching the image in COO operator CSV.');
@@ -228,7 +228,7 @@ const operatorUtils = {
       cy.log(`Monitoring plugin pod is now running in namespace: ${MCP.namespace}`);
     });
     cy.exec(`oc label namespace openshift-cluster-observability-operator openshift.io/cluster-monitoring="true" --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
-    cy.reload();
+    cy.reload(true);
     cy.visit('/monitoring/v2/dashboards');
     cy.url().should('include', '/monitoring/v2/dashboards');
   },
@@ -250,7 +250,7 @@ const operatorUtils = {
       ).then((result) => {
         expect(result.code).to.eq(0);
         cy.log(`CMO CSV reverted successfully with Monitoring Plugin image: ${result.stdout}`);
-        cy.reload();
+        cy.reload(true);
       });
     } else {
       cy.log('MP_IMAGE is NOT set. Skipping reverting the image in CMO operator CSV.');
@@ -266,6 +266,21 @@ const operatorUtils = {
         `oc delete ${config.kind} ${config.name} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
 
+      cy.log('Remove openshift-cluster-sample-dashboard instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove perses-dashboard-sample instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/perses-dashboard-sample.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove prometheus-overview-variables instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/prometheus-overview-variables.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove thanos-compact-overview-1var instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-compact-overview-1var.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove Thanos Querier instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
       cy.log('Remove perses-dev namespace');
       cy.executeAndDelete(`oc delete namespace perses-dev --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
 
@@ -279,6 +294,21 @@ const operatorUtils = {
         `oc delete ${config.kind} ${config.name} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`,
       );
 
+      cy.log('Remove openshift-cluster-sample-dashboard instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/openshift-cluster-sample-dashboard.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove perses-dashboard-sample instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/perses-dashboard-sample.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove prometheus-overview-variables instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/prometheus-overview-variables.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove thanos-compact-overview-1var instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-compact-overview-1var.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
+      cy.log('Remove Thanos Querier instance.');
+      cy.executeAndDelete(`oc delete -f ./cypress/fixtures/coo/thanos-querier-datasource.yaml --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);
+
       cy.log('Remove Cluster Observability Operator namespace');
       cy.executeAndDelete(`oc delete namespace ${MCP.namespace} --kubeconfig ${Cypress.env('KUBECONFIG_PATH')}`);