Merge branch 'master' into efoley/cr_tests_mark_one_optional

infrawatch · Feb 14, 2025 · 6ea82ad · 6ea82ad
2 parents 98df69f + b240e82
commit 6ea82ad
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 3 deletions.
diff --git a/.zuul.yaml b/.zuul.yaml
@@ -72,6 +72,7 @@
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-metric-verification-test.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml"
+        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-use-master-containers.yml"
     roles:
       - zuul: github.com/openstack-k8s-operators/ci-framework
     required-projects: *required_projects

diff --git a/ci/logging_tests_controller.yml b/ci/logging_tests_controller.yml
@@ -6,6 +6,8 @@
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
+  vars_files:
+    - vars/osp18_env.yml
   vars:
     common_pod_test_id: "RHOSO-12672"
     common_pod_status_str: "Running"
@@ -23,6 +25,25 @@
       - openshift
       - openstack-operators
       - openshift-logging
+    common_endpoint_test_id: "RHOSO-12682"
+    common_endpoint_list:
+      - [nova,compute,public]
+      - [nova,compute,internal]
+      - [placement,placement,public]
+      - [placement,placement,internal]
+      - [swift,object-store,public]
+      - [swift,object-store,internal]
+      - [cinderv3,volumev3,public]
+      - [cinderv3,volumev3,internal]
+      - [barbican,key-manager,public]
+      - [barbican,key-manager,internal]
+      - [keystone,identity,public]
+      - [keystone,identity,internal]
+      - [glance,image,public]
+      - [glance,image,internal]
+      - [neutron,network,public]
+      - [neutron,network,internal]
+
     common_service_test_id: "RHOSO-12675"
     common_service_nspace: openshift-logging
     common_service_list:
@@ -143,7 +164,22 @@
     common_pod_nspace: openstack
     common_pod_status_str: "Completed"
     common_pod_list:
+      - bootstrap-edpm-deployment-openstack-edpm-ipam
+      - configure-network-edpm-deployment-openstack-edpm-ipam
+      - configure-os-edpm-deployment-openstack-edpm-ipam
+      - download-cache-edpm-deployment-openstack-edpm-ipam
+      - install-certs-edpm-deployment-openstack-edpm-ipam
+      - install-os-edpm-deployment-openstack-edpm-ipam
+      - libvirt-edpm-deployment-openstack-edpm-ipam
       - logging-edpm-deployment-openstack-edpm-ipam
+      - neutron-metadata-edpm-deployment-openstack-edpm-ipam
+      - nova-edpm-deployment-openstack-edpm-ipam
+      - ovn-edpm-deployment-openstack-edpm-ipam
+      - reboot-os-edpm-deployment-openstack-edpm-ipam
+      - run-os-edpm-deployment-openstack-edpm-ipam
+      - ssh-known-hosts-edpm-deployment
+      - telemetry-edpm-deployment-openstack-edpm-ipam
+      - validate-network-edpm-deployment-openstack-edpm-ipam
   tasks:
     - name: "Run pods completed tests"
       ansible.builtin.import_role:
@@ -157,13 +193,20 @@
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars:
+    common_service_test_id: "RHOSO-12749"
+    common_service_nspace: openstack
+    common_service_list:
+      - nova-internal
+      - nova-metadata-internal
+      - nova-novncproxy-cell1-public
+      - nova-public
     common_crd_test_id: "RHOSO-12670"
     common_crd_list:
       - alertingrules.loki.grafana.com
       - lokistacks.loki.grafana.com
       - recordingrules.loki.grafana.com
       - rulerconfigs.loki.grafana.com
   tasks:
-    - name: "Run the crds tests"
+    - name: "Run Services and CRD tests"
       ansible.builtin.import_role:
         name: common
diff --git a/roles/common/README.md b/roles/common/README.md
@@ -58,7 +58,8 @@ For endpoint_tests.yml tasks:
       - polarion ID number for each test.
     common_endpoint_list
       - list of endpoints to validate
-
+    openstack_cmd
+      - The command used to run openstack
 
 For project_tests.yml tasks:
 

diff --git a/roles/common/defaults/main.yml b/roles/common/defaults/main.yml
@@ -0,0 +1,2 @@
+---
+openstack_cmd: "openstack"
diff --git a/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml b/roles/telemetry_verify_metrics/tasks/verify_ceilometer_compute_metrics.yml
@@ -52,7 +52,7 @@
       failed_when: result.rc >= 1
 
     - name: |
-        TEST Use openstack observabilityclient to verify ceilometer compute metrics are stored in prometheus
+        TEST Use openstack observabilityclient to verify ceilometer_cpu compute metrics are stored in prometheus
         RHOSO-1213
       ansible.builtin.shell: |
         {{ openstack_cmd }} metric show ceilometer_cpu
@@ -62,6 +62,17 @@
       until: result.rc == 0 and "ceilometer_cpu" in result.stdout
       changed_when: false
 
+    #todo: Create Test Id in Polarian
+    - name: |
+        TEST Use openstack observabilityclient to verify ceilometer_power_state compute metrics are stored in prometheus
+      ansible.builtin.shell: |
+        {{ openstack_cmd }} metric show ceilometer_power_state
+      register: result
+      delay: 30
+      retries: 10
+      until: result.rc == 0 and "ceilometer_power_state" in result.stdout
+      changed_when: false
+
   always:
     - name: Delete the server
       ansible.builtin.shell: |