Combine metrics and autoscaling fvt into one job (#254)

Add metrics tests to autoscaling-osp18 job

* Rename run_autoscaling_metrics_osp18.yml to run_cloudops_tests_osp18.yml
* add patch_observabilityclient to run_cloudops_tests_osp18.yml

Author: ayefimov-1

.zuul.yaml

@@ -3,16 +3,18 @@
     name: functional-autoscaling-tests-osp18
     parent: telemetry-operator-multinode-autoscaling
     description: |
-      Run the autoscaling functional tests and tempest tests on osp18+patched
-      versions of aodh and heat.
+      Run autoscaling functional tests, tempest tests and metrics
+      functional tests on osp18+patched versions of aodh and heat.
     vars:
-      patch_openstackversions: true
+      patch_observabilityclient: true
       cifmw_extras:
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/ci-framework'].src_dir }}/scenarios/centos-9/multinode-ci.yml"
         - "@{{ 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/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-power-monitoring.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-functional-test.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
@@ -47,6 +49,11 @@
       - roles/test_sensubility/.*
       - roles/test_snmp_traps/.*
       - roles/test_verify_email/.*
+    files:
+      - roles/telemetry_verify_metrics/.*
+      - .zuul.yaml
+      - ci/vars-metric-verification-test.yml
+      - ci/report_result.yml
 
 - job:
     name: functional-tests-on-osp18
@@ -137,11 +144,13 @@
               - roles/telemetry_autoscaling/.*
               - .zuul.yaml
               - ci/vars-functional-test.yml
-              - ci/run_autoscaling_osp18.yml
+              - ci/run_cloudops_tests_osp18.yml
               - ci/vars-use-master-containers.yml
               - ci/use-master-containers.yml
               - ci/patch-openstack-version.yaml
               - ci/report_result.yml
+              - roles/telemetry_verify_metrics/.*
+              - ci/vars-metric-verification-test.yml
         - functional-logging-tests-osp18:
             irrelevant-files: *irrelevant_files
             files:
@@ -162,11 +171,3 @@
               - ci/vars-graphing-test.yml
               - ci/run_graphing_test.yml
               - ci/report_result.yml
-        - functional-metric-verification-tests-osp18:
-            irrelevant-files:  *irrelevant_files
-            files:
-              - roles/telemetry_verify_metrics/.*
-              - .zuul.yaml
-              - ci/vars-metric-verification-test.yml
-              - ci/run_verify_metrics_osp18.yml
-              - ci/report_result.yml

ci/run_autoscaling_osp18.yml renamed to ci/run_cloudops_tests_osp18.yml

@@ -26,11 +26,16 @@
               oc exec openstackclient -- python3 -m ensurepip --upgrade
               oc exec openstackclient -- python3 -m pip install --upgrade aodhclient
               oc exec openstackclient -- python3 -m pip install --upgrade python-observabilityclient
-          when: "{{ patch_openstackversions | bool }}"
+          when: "{{ patch_observabilityclient | bool }}"
           tags:
             - setup
 
         - name: "Run Telemetry Autoscaling tests"
           ansible.builtin.import_role:
             name: telemetry_autoscaling
           ignore_errors: true
+
+        - name: "Run Telemetry Verify Metrics tests"
+          ansible.builtin.import_role:
+            name: telemetry_verify_metrics
+          ignore_errors: true

ci/vars-functional-test.yml

@@ -6,7 +6,7 @@
 # skip os-net-setup
 cifmw_os_net_setup_config: []
 pre_tests_00_run_functional_test:
-  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_autoscaling_osp18.yml"
+  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_cloudops_tests_osp18.yml"
   type: playbook
   config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"