OSPRH-16753: Converge autoscaling logging & graphing tests based on enabled features (#275)

* [ci] Converge autoscaling & graphing osp18 tests based on enabled features

* [ci] Create functional-tests-osp18 job

* [ci] Rename run_cloudops_tests_osp18.yml to run_autoscaling_tests.yml

* [ci] Improve fvt skip tests logic

* [ci] Consolidate autoscaling and graphing playbooks into functional playbook

* [ci] Merge vars-logging-test playbook into vars-functional-test

* [ci] Rename logging tests

* [ci] Update github-check with functional-tests-osp18

Author: MiguelCarpio

.zuul.yaml

@@ -1,11 +1,11 @@
 ---
 - job:
-    name: functional-autoscaling-tests-osp18
+    name: functional-tests-osp18
     dependencies: ["telemetry-openstack-meta-content-provider-master"]
     parent: telemetry-operator-multinode-autoscaling
     description: |
       Run autoscaling functional tests, tempest tests, metrics
-      functional tests and logging functional tests on
+      functional tests, graphing functional tests and logging functional tests on
       osp18+patched versions of aodh and heat.
     extra-vars: &functional_autoscaling_extra_vars
       # Override zuul meta content provider provided content_provider_dlrn_md5_hash
@@ -15,12 +15,12 @@
     vars:
       patch_observabilityclient: true
       cifmw_update_containers: false
+      crc_enable_monitoring: 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-logging.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-logging-test.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"
@@ -61,36 +61,40 @@
 
 - job:
     name: functional-tests-on-osp18
-    parent: functional-autoscaling-tests-osp18
+    parent: functional-tests-osp18
     extra-vars: *functional_autoscaling_extra_vars
     description: |
-      functional-tests-on-osp18 is an alias of functional-autoscaling-tests-osp18, 
+      functional-tests-on-osp18 is an alias of functional-tests-osp18, 
       temporary added until openstack-k8s-operators/telemetry-operator updates 
       references of functional-tests-on-osp18 jobs.
 
+- job:
+    name: functional-autoscaling-tests-osp18
+    parent: functional-tests-osp18
+    description: |
+      functional-autoscaling-tests-osp18 is an alias of functional-tests-osp18, 
+      temporary added until openstack-k8s-operators/telemetry-operator updates 
+      references of functional-tests-osp18.
+
+- job:
+    name: functional-graphing-tests-osp18
+    parent: functional-tests-osp18
+    description: |
+      functional-graphing-tests-osp18 is an alias of functional-tests-osp18, 
+      temporary added until openstack-k8s-operators/telemetry-operator updates 
+      references of functional-tests-osp18.
+
 - job:
     name: functional-logging-tests-osp18
-    dependencies: ["telemetry-openstack-meta-content-provider-master"]
-    parent: telemetry-operator-multinode-logging
+    parent: functional-tests-osp18
     description: |
-      Run the logging functional tests and tempest smoketests on osp18
-    extra-vars: *functional_autoscaling_extra_vars
-    vars:
-      cifmw_update_containers: false
-      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-logging.yml"
-          # Use the tempest config we have for autoscaling tests
-        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml"
-          # There's an override in here to modify the enabled tests to include only the smoke tests
-        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-logging-test.yml"
-    roles:
-      - zuul: github.com/openstack-k8s-operators/ci-framework
-    required-projects: *required_projects
+      functional-logging-tests-osp18 is an alias of functional-tests-osp18, 
+      temporary added until openstack-k8s-operators/telemetry-operator updates 
+      references of functional-tests-osp18.
 
 - job:
     name: functional-metric-verification-tests-osp18
-    parent: functional-autoscaling-tests-osp18
+    parent: functional-tests-osp18
     extra-vars: *functional_autoscaling_extra_vars
     description: |
       Run the autoscaling functional tests, tempest tests and metrics
@@ -105,35 +109,18 @@
     run:
       - ci/noop.yml
 
-- job:
-    name: functional-graphing-tests-osp18
-    dependencies: ["telemetry-openstack-meta-content-provider-master"]
-    parent: telemetry-operator-multinode-autoscaling
-    description: |
-      Run the UI Graphing test and tempest smoketests on osp18.
-    vars:
-      cifmw_update_containers: false
-      crc_enable_monitoring: 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"
-          # Use the tempest config we have for autoscaling tests
-        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-autoscaling-tempest.yml"
-          # Currently, this runs tempest smoketests after the dashboards have been disabled again
-        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-graphing-test.yml"
-    roles:
-      - zuul: github.com/openstack-k8s-operators/ci-framework
-    required-projects: *required_projects
-    extra-vars: *functional_autoscaling_extra_vars
-
 - job:
     name: functional-periodic-telemetry-with-ceph
     parent: podified-multinode-hci-deployment-crc-1comp-backends
     dependencies: ["telemetry-openstack-meta-content-provider-master"]
     description: |
       Deploy OpenStack with Telemetry and Ceph. Run metric-verification with volume pool metric tests
-    extra-vars: *functional_autoscaling_extra_vars
+    extra-vars: 
+      # Override zuul meta content provider provided content_provider_dlrn_md5_hash
+      # var. As returned dlrn md5 hash comes from master release but job is using
+      # antelope content.
+      content_provider_dlrn_md5_hash: ''
+      run_graphing_test: false
     vars:
       patch_observabilityclient: true
       cifmw_update_containers: false
@@ -152,7 +139,6 @@
         - "@{{ 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/ci-framework'].src_dir  }}/scenarios/centos-9/hci_ceph_backends.yml"
         - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/openstack-k8s-operators/telemetry-operator'].src_dir }}/ci/vars-telemetry-with-ceph.yml"
-        - "@{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/vars-logging-test.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"
@@ -172,40 +158,14 @@
             override-checkout: main
         - feature-verification-tests-noop:
             files: *irrelevant_files
-        - functional-autoscaling-tests-osp18:
+        - functional-tests-osp18:
             files:
               - roles/telemetry_autoscaling/.*
-              - roles/common/*
-              - .zuul.yaml
-              - ci/vars-functional-test.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:
+              - roles/telemetry_graphing/.*
               - roles/telemetry_logging/.*
               - roles/common/*
+              - roles/telemetry_verify_metrics/.*
               - .zuul.yaml
-              - ci/vars-logging-test.yml
-              - ci/logging_tests_all.yml
-              - ci/logging_tests_computes.yml
-              - ci/logging_tests_controller.yml
-              - ci/report_result.yml
-        - functional-graphing-tests-osp18:
-            voting:
-              false
-            irrelevant-files: *irrelevant_files
-            files:
-              - roles/telemetry_graphing/.*
-              - .zuul.yaml
-              - ci/vars-graphing-test.yml
-              - ci/run_graphing_test.yml
-              - ci/report_result.yml
         - functional-periodic-telemetry-with-ceph:
             files:
               # Run this job for changes to the volume_pool_metrics test changes as this is

ci/run_cloudops_tests_osp18.yml renamed to ci/run_autoscaling_tests.yml

@@ -8,6 +8,35 @@
   vars_files:
     - vars/common.yml
     - vars/osp18_env.yml
+  pre_tasks:
+    - name: "Notify if autoscaling test is skipped by run_autoscaling_test false"
+      ansible.builtin.debug:
+        msg: "Skipping the autoscaling test because run_autoscaling_test extra_vars is set to false"
+      when: not run_autoscaling_test | default(true) | bool
+
+    - name: "Skip autoscaling test by run_autoscaling_test false"
+      ansible.builtin.meta: end_play
+      when: not run_autoscaling_test | default(true) | bool
+
+    - name: "Get OpenStackControlPlane autoscaling status"
+      ansible.builtin.command: >
+        oc get oscp -n openstack -o jsonpath='{.items[0].spec.telemetry.template.autoscaling.enabled}'
+      register: autoscaling_status
+      changed_when: false
+
+    - name: "Set fact if autoscaling is enabled"
+      ansible.builtin.set_fact:
+        autoscaling_enabled: "{{ autoscaling_status.stdout | trim | lower == 'true' }}"
+
+    - name: "Notify if autoscaling test is skipped by autoscaling status"
+      ansible.builtin.debug:
+        msg: "Skipping the autoscaling test because OpenStackControlPlane telemetry autoscaling is disabled"
+      when: not autoscaling_enabled | bool
+
+    - name: "Skip autoscaling test by autoscaling disabled"
+      ansible.builtin.meta: end_play
+      when: not autoscaling_enabled | bool
+
   tasks:
     - block:
         - name: Include vars from the extra_vars files

ci/run_functional_tests.yml

@@ -0,0 +1,8 @@
+- name: Run Logging test
+  ansible.builtin.import_playbook: logging_tests_all.yml
+
+- name: Run Autoscaling test
+  ansible.builtin.import_playbook: run_autoscaling_tests.yml
+
+- name: Run Graphing Console UI test
+  ansible.builtin.import_playbook: run_graphing_test.yml

ci/run_graphing_test.yml

@@ -10,6 +10,34 @@
     PASSWORD: "{{ cifmw_openshift_password }}"
   vars_files:
     - vars/common.yml
+  pre_tasks:
+    - name: "Notify if graphing test is skipped by run_graphing_test false"
+      ansible.builtin.debug:
+        msg: "Skipping the graphing test because run_graphing_test extra_vars is set to false"
+      when: not run_graphing_test | default(true) | bool
+
+    - name: "Skip graphing test by run_graphing_test false"
+      ansible.builtin.meta: end_play
+      when: not run_graphing_test | default(true) | bool
+
+    - name: "Get OpenStackControlPlane telemetry dashboardsEnabled status"
+      ansible.builtin.command: >
+        oc get oscp -n openstack -o jsonpath='{.items[0].spec.telemetry.template.metricStorage.dashboardsEnabled}'
+      register: dashboard_status
+      changed_when: false
+
+    - name: "Set fact if dashboards are enabled"
+      ansible.builtin.set_fact:
+        dashboards_enabled: "{{ dashboard_status.stdout | trim | lower == 'true' }}"
+
+    - name: "Notify if graphing test is skipped by dashboardsEnabled status"
+      ansible.builtin.debug:
+        msg: "Skipping the graphing test because OpenStackControlPlane telemetry dashboards are disabled"
+      when: not dashboards_enabled | bool
+
+    - name: "Skip graphing test by dashboardsEnabled disabled"
+      ansible.builtin.meta: end_play
+      when: not dashboards_enabled | bool
   tasks:
     - block:
         - name: "Run Graphing Console UI tests"

ci/vars-functional-test.yml

@@ -6,8 +6,11 @@
 # 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_cloudops_tests_osp18.yml"
+  source: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/run_functional_tests.yml"
   type: playbook
+  extra_vars:
+    run_autoscaling_test: true
+    run_graphing_test: true
   config_file: "{{ ansible_user_dir }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}/ci/ansible.cfg"
 cifmw_run_tests: true
 # redefine this to clear the skipped test