Update Autoscaling Job

Author: mgirgisf

callback_plugins/custom_logger.py

@@ -31,7 +31,7 @@ class CallbackModule(CallbackBase):
 
     def __init__(self):
         super(CallbackModule, self).__init__()
-        self.output_dir = os.getcwd()
+        self.output_dir =  os.path.expanduser("~/")
         self.results = {}
 
     def playbook_on_stats(self, stats):

ci/osp18_functional_tests.yml

@@ -2,18 +2,18 @@
 - name: Move callback_plugin result to log dir
   ansible.builtin.shell:
     cmd: |
-      cp  {{ fvt_dir }}/test_run_result.out {{ logs_dir }}/test_run_result.log
-      cp  {{ fvt_dir }}/summary_results.log {{ logs_dir }}/summary_results.log
+      cp  ~/test_run_result.out {{ autoscaling_logs_dir }}/test_run_result.log
+      cp  ~/summary_results.log {{ autoscaling_logs_dir }}/summary_results.log
 
 - name: Grep the number of failed tasks
   ansible.builtin.shell:
     cmd: |
-        grep "Tasks Failed:" {{ fvt_dir }}/summary_results.log | awk '{print $3}'
+        grep "Tasks Failed:" ~/summary_results.log | awk '{print $3}'
   register: tasks_failed
 
 - name: Determine success or failure based on the number of failed tasks
   ansible.builtin.assert:
     that:
       - tasks_failed.stdout == "0"
-    fail_msg: "Tasks Failed: {{ tasks_failed.stdout }}. Check the logs in {{ logs_dir }}/summary_results.log."
+    fail_msg: "Tasks Failed: {{ tasks_failed.stdout }}. Check the logs in {{ autoscaling_logs_dir }}/summary_results.log."
     success_msg: "Tasks Failed: {{ tasks_failed.stdout }}. All tasks succeeded."

ci/report_result.yml

@@ -1,35 +1,25 @@
 ---
-- name: "Run functional test playbooks"
+- name: Run telemetry autoscaling tests on osp18
   hosts:  "{{ cifmw_target_hook_host | default('localhost')  }}"
   gather_facts: true
   environment:
     KUBECONFIG: "{{ cifmw_openshift_kubeconfig }}"
     PATH: "{{ cifmw_path }}"
   vars_files:
     - vars/common.yml
+    - vars/osp18_env.yml
   tasks:
-    - name: "Create log dir"
-      ansible.builtin.file:
-        path: "{{ logs_dir }}"
-        state: directory
-        mode: "0755"
+    - block:
+        - name: "Create log dir"
+          ansible.builtin.file:
+            path: "{{ autoscaling_logs_dir }}"
+            state: directory
+            mode: "0755"
 
-    - name: "Set dynamic KUBECONFIG and PATH vars"
-      copy:
-        content: |
-          cifmw_openshift_kubeconfig: "{{ cifmw_openshift_kubeconfig }}"
-          cifmw_path: "{{ cifmw_path }}"
-          vars_dir: "{{ fvt_dir }}/ci/vars"
-        dest: "{{ env_vars_file }}"
+        - name: Include vars from the extra_vars files
+          ansible.builtin.include_vars:
+            dir: "{{ cifmw_basedir }}/artifacts/parameters"
 
-    - name: Include vars from the extra_vars files
-      ansible.builtin.include_vars:
-        dir: "{{ cifmw_basedir }}/artifacts/parameters"
-
-    # Prepare the env
-    - name: Setup the required resources before running the autoscaling functional test
-      block:
-          # TODO: Look at replacing this with something NOT from install_yamls.
         - community.general.make:
             chdir: '{{ ansible_env.HOME }}/{{ zuul.projects["github.com/openstack-k8s-operators/install_yamls"].src_dir }}/devsetup'
             target: edpm_deploy_instance
@@ -39,7 +29,7 @@
         - name: Patch the openstackversions to use the master containers for aodh and heat
           ansible.builtin.shell:
             cmd: |
-              oc patch openstackversions controlplane  --type merge --patch-file ci/patch-openstack-versions.yaml
+              oc patch openstackversions controlplane --type merge --patch-file ci/patch-openstack-versions.yaml
             chdir: "{{ fvt_dir }}"
           when: "{{ patch_openstackversions | bool }}"
           tags:
@@ -67,24 +57,19 @@
           tags:
             - setup
 
-        - name: "Run telemetry tests playbook locally on the target host"
-          ansible.builtin.shell:
-            cmd: |
-              ANSIBLE_CONFIG=ci/ansible.cfg ansible-playbook -v  -e @"{{ env_vars_file }}" ci/osp18_functional_tests.yml
-            chdir: "{{ fvt_dir }}"
-          register: output
-
-        - name: Save ansible output to a file
-          ansible.builtin.copy:
-            content: "{{ output.stdout }}"
-            dest: "{{ logs_dir }}/ansible_run.log"
-      always:
+        - name: "Run Telemetry Autoscaling tests"
+          ansible.builtin.import_role:
+            name: telemetry_autoscaling
+          vars:
+            vars_path:  "{{ fvt_dir }}/ci/vars"
+          tags: autoscaling
+      always:   
         - name: Revert the version update
           ansible.builtin.shell:
             cmd: |
               oc patch  openstackversions controlplane  --type json -p='[{"op": "replace", "path": "/spec/customContainerImages", "value": {} }]'
           when: "{{ patch_openstackversions | bool }}"
 
-    - name: Include report result 
-      ansible.builtin.include_tasks:
-        file: report_result.yml
+        - name: Include report result 
+          ansible.builtin.include_tasks:
+            file: report_result.yml

ci/run_playbooks.yml renamed to ci/run_autoscaling_osp18.yml

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

ci/vars-functional-test.yml

@@ -1,4 +1,3 @@
 ---
 fvt_dir: "{{ ansible_env.HOME }}/{{ zuul.projects['github.com/infrawatch/feature-verification-tests'].src_dir }}"
-logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/logs/functional-tests"
-env_vars_file: "/tmp/env_vars.yml"
+autoscaling_logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/logs/autoscaling_logs"

ci/vars/common.yml

@@ -36,9 +36,6 @@
   ansible.builtin.debug:
     var: result
 
-    #- name: Wait for 60 sec
-    #  ansible.builtin.pause:
-    #    minutes: 1
 
 - name: RHOSO-12704 Verify that the stack was created successfully
   ansible.builtin.shell: |
@@ -49,6 +46,10 @@
   timeout: 30
   retries: 20
 
+- name: Wait for 5 mins
+  ansible.builtin.pause:
+    minutes: 5
+
 - name: RHOSO-12650 Verify that the stack resources are created
   ansible.builtin.shell: |
     # source ~/overcloudrc;
@@ -58,7 +59,7 @@
   timeout: 30
   retries: 20
   until: '"CREATE_COMPLETE" in result.stdout'
-    #  failed_when: '"CREATE_COMPLETE" not in result.stdout'
+  failed_when: '"CREATE_COMPLETE" not in result.stdout'
 
 - name: RHOSO-12707 Verify that ceilometer_cpu metric exist
   ansible.builtin.shell: |

roles/telemetry_autoscaling/tasks/creating_stack.yml

@@ -20,4 +20,4 @@
   ignore_errors: true
   retries: 50
   timeout: 5
-  
+