Merge branch 'master' into rename_tests

Author: elfiesmelfie

.zuul.yaml

@@ -34,6 +34,15 @@
       - callback_plugins/.*
       - README*
       - .*/*.md
+      - roles/client_side_tests/.*
+      - roles/test_alerts/.*
+      - roles/test_collectd/.*
+      - roles/test_metrics_retention/.*
+      - roles/test_observability_strategy/.*
+      - roles/test_qdr/.*
+      - roles/test_sensubility/.*
+      - roles/test_snmp_traps/.*
+      - roles/test_verify_email/.*
 
 - job:
     name: functional-logging-tests-osp18
@@ -100,6 +109,7 @@
         - feature-verification-tests-noop
         - openstack-k8s-operators-content-provider:
             override-checkout: main
+            irrelevant-files: *irrelevant_files
         - functional-tests-on-osp18
         - functional-logging-tests-osp18
         - functional-graphing-tests-osp18

roles/telemetry_graphing/files/cypress.config.js

@@ -1,7 +1,7 @@
 const { defineConfig } = require('cypress')
 module.exports = defineConfig({
   e2e: {
-    baseUrl: 'https://console-openshift-console.apps-crc.testing',
+    baseUrl: 'https://console-openshift-console.apps-crc.testing/login',
     specPattern: 'cypress/integration/**/*.{js,jsx,ts,tsx}',
     supportFile: false,
   },

roles/telemetry_graphing/files/dashboard-openstack-cloud.js

@@ -19,6 +19,7 @@ describe('OpenShift Console Dashboard Test', () => {
       }
     });
 
+
   });
 
   it('should load and validate the OpenStack dashboards', () => {
@@ -36,11 +37,9 @@ describe('OpenShift Console Dashboard Test', () => {
     dashboards.forEach(dashboard => {
       cy.visit(`https://console-openshift-console.apps-crc.testing/monitoring/dashboards${dashboard.url}`);
 
-      cy.wait(5000); 
-
       // Wait for the dashboard to load and take a screenshot
-      cy.get('div[data-test-id="dashboard"]', { timeout: 10000 })
-        .find('[data-test-id="panel-"], [data-test-id="panel-cpu"], [data-test-id="panel-overview"]') 
+      cy.get('div[data-test-id="dashboard"]', { timeout: 50000 })
+        .find('[data-test-id^="panel-"]')
 
       cy.wait(5000); 
       cy.screenshot(dashboard.screenshot);

roles/test_alerts/tasks/main.yml

@@ -1,4 +1,11 @@
 ---
+- name: "Set the prom auth"
+  ansible.builtin.include_role:
+    name: client_side_tests
+    tasks_from: get_prom_info.yml
+  vars:
+    prom_auth_method: token
+
 - name: "Test Creating an alert rule in Prometheus"
   ansible.builtin.include_tasks:
     file: test_create_an_alert.yml

roles/test_sensubility/tasks/test_health_status.yml

@@ -34,11 +34,13 @@
   changed_when: false
   failed_when: container_nodes.stdout_lines|length != 0
 
-
+- name: "Wait 1 minute before checking that health status of container has been changed"
+  ansible.builtin.pause:
+    minutes: 1
 
 - name: RHELOSP-176036 Check that health status of container changed to 0
   ansible.builtin.shell:
-    cmd: /usr/bin/curl -k {{ prom_auth_string }} -g https://{{ prom_url }}/api/v1/query? --data-urlencode 'query=last_over_time(sensubility_container_health_status{process="logrotate_crond",host="{{ groups['overcloud_nodes'][0] }}"}[10m])' | grep -oP '(?<="value":).*' | awk -F, '{ print $2 }' | grep -o '[0-9]\+' | grep 0 | wc -l
+    cmd: /usr/bin/curl -k {{ prom_auth_string }} -g https://{{ prom_url }}/api/v1/query? --data-urlencode 'query=last_over_time(sensubility_container_health_status{process="logrotate_crond",host="controller-0.redhat.local"}[10m])' | grep -oP '(?<="value":).*' | awk -F, '{ print $2 }' | grep -o '[0-9]\+' | grep 0 | wc -l
     #  /usr/bin/curl -k {{ prom_auth_string }} \
     #    -g https://{{ prom_url }}/api/v1/query? \
     #    --data-urlencode 'query=last_over_time(sensubility_container_health_status{process="logrotate_crond",host="{{ groups['overcloud_nodes'][0] }}"}[10m])' \
@@ -59,13 +61,17 @@
   changed_when: false
 
 
+- name: "Wait 1 minute before checking that health status of container has been changed"
+  ansible.builtin.pause:
+    minutes: 1
+
 
 - name: RHELOSP-176038 Check that health status of container changed to 1
   ansible.builtin.shell:
     cmd: >-
       /usr/bin/curl -k {{ prom_auth_string }} \
         -g https://{{ prom_url }}/api/v1/query? \
-        --data-urlencode 'query=last_over_time(sensubility_container_health_status{process="logrotate_crond",host="{{ groups['overcloud_nodes'][0] }}"}[10m])' \
+        --data-urlencode 'query=last_over_time(sensubility_container_health_status{process="logrotate_crond",host="controller-0.redhat.local"}[10m])' \
         | grep -oP '(?<="value":).*' | awk -F, '{ print $2 }' |  grep -o '[0-9]\+' | grep 1 | wc -l
   register: output
   changed_when: false