[zuul] Update Autoscaling job to run the playbooks directly from the hook (#118)

Pass the config file and the autoscaling test playbook directly to the hook instead of using an intermediate playbook.
This is made possible since the hooks were updated to pass in a config file to the playbooks.

Author: mgirgisf

.github/workflows/check_plugin.yml

@@ -8,5 +8,5 @@ jobs:
       - uses: actions/checkout@v3
       - run: python3 -m pip install ansible
       - name: Run the test_logger playbook.
-        run: cd ci && rm -rf test_run_result.out && ${HOME}/.local/bin/ansible-playbook -v github/test_logger.yml && diff -s test_run_result.out github/test_logger_expected
+        run: cd ci && rm -rf ~/test_run_result.out && ${HOME}/.local/bin/ansible-playbook -v github/test_logger.yml && diff -s ~/test_run_result.out github/test_logger_expected
 

callback_plugins/custom_logger.py

@@ -31,11 +31,11 @@ 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):
-        # Log results for each host
+        #Log results for each host
         hosts= stats.processed
         for host in hosts:
             self.log_summary_results(host)

ci/osp18_functional_tests.yml

@@ -2,18 +2,17 @@
 - 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  {{ test_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 -c "failed" ~/test_run_result.out
   register: tasks_failed
+  ignore_errors: yes
 
 - 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."
-    success_msg: "Tasks Failed: {{ tasks_failed.stdout }}. All tasks succeeded."
+  ansible.builtin.fail:
+    msg: "The log file contains failed task."
+  when: tasks_failed.rc == 0

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: "{{ logs_dir }}/autoscaling"
+            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
+          
+      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
+          vars:
+            test_dir: "{{ logs_dir }}/autoscaling"

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"
+logs_dir: "{{ ansible_env.HOME }}/ci-framework-data/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,7 @@
   timeout: 30
   retries: 20
 
+
 - name: RHOSO-12650 Verify that the stack resources are created
   ansible.builtin.shell: |
     # source ~/overcloudrc;
@@ -58,7 +56,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

@@ -2,14 +2,6 @@
 # tasks file for telemetry_autoscaling
   # TODO: Update the pre-checks to include the resources that the stack expects to exist
   # i.e. networks, flavor, image, security group
-- name: Gather list of vars files
-  set_fact:
-    vars_files: "{{ lookup('fileglob', vars_path + '/*.yml', wantlist=True) }}"
-
-- name: Include multiple variable files
-  include_vars: "{{ item }}"
-  with_items: "{{ vars_files }}"
-
 - name: RHOSO-12666 Test services are enabled for autoscaling
   when: metrics_backend == "prometheus"
   ansible.builtin.include_tasks: 

roles/telemetry_autoscaling/tasks/main.yml

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