Enable automatic execution for HA SCS test cases and add ENSA version check in kill-message-server.yml

Author: devanshjainms

src/roles/ha_scs/tasks/kill-message-server.yml

@@ -33,16 +33,26 @@
             test_execution_start:       "{{ now(utc=true, fmt='%Y-%m-%d %H:%M:%S') }}"
             test_execution_hostname:    "{{ hostvars[cluster_status_pre.ascs_node].ansible_hostname }}"
 
+        - name:                         "Test Execution: Check for ENSA version"
+          ansible.builtin.shell:        pgrep -f 'enq.sap{{ sap_sid | upper }}' | wc -l
+          register:                     ensa2_check
+          failed_when:                  false
+
         - name:                         "Test Execution: Kill Message Server Process"
-          ansible.builtin.shell:        pgrep -f "ms.sap{{ sap_sid | upper }}" | xargs kill -9
+          ansible.builtin.shell: |
+                                        while true; do
+                                          pgrep -f 'ms.sap{{ sap_sid | upper }}' | xargs kill -9 || break
+                                        done
           register:                     kill_ms_result
-          failed_when:                  false
+          failed_when:                  "'kill: not enough arguments' in kill_ms_result.stderr"
+          ignore_errors:                true
 
         - name:                         "Test Execution: Wait for Failover"
           ansible.builtin.pause:
-            seconds:                    60
+            seconds:                    30
 
-        - name:                         "Test Execution: Validate SCS cluster status"
+        - name:                         "Test Execution: Validate SCS cluster status for ENSA1"
+          when:                         ensa2_check.stdout == "0"
           get_cluster_status_scs:
             sap_sid:                    "{{ sap_sid | lower }}"
             ansible_os_family:          "{{ ansible_os_family | upper }}"
@@ -54,6 +64,19 @@
                                         cluster_status_test_execution.ascs_node == cluster_status_pre.ers_node
                                         and cluster_status_test_execution.ers_node == cluster_status_pre.ascs_node
 
+        - name:                         "Test Execution: Validate SCS cluster status for ENSA2"
+          when:                         ensa2_check.stdout != "0"
+          get_cluster_status_scs:
+            sap_sid:                    "{{ sap_sid | lower }}"
+            ansible_os_family:          "{{ ansible_os_family | upper }}"
+          register:                     cluster_status_test_execution
+          retries:                      50
+          delay:                        10
+          failed_when:                  false
+          until: |
+                                        cluster_status_test_execution.ascs_node != ""
+                                        and cluster_status_test_execution.ers_node != ""
+
         - name:                         "Test Execution: Cleanup resources"
           ansible.builtin.command:      crm_resource --cleanup
           register:                     cleanup_failed_resource_test_execution
@@ -67,15 +90,15 @@
           ansible.builtin.set_fact:
             test_case_message_from_test_case: |
                                         Old ASCS: {{ cluster_status_pre.ascs_node }}
-                                        New ASCS: {{ hostvars[cluster_status_pre.ascs_node].cluster_status_test_execution.ascs_node }}
+                                        New ASCS: {{ cluster_status_test_execution.ascs_node }}
                                         Old ERS: {{ cluster_status_pre.ers_node }}
-                                        New ERS: {{ hostvars[cluster_status_pre.ascs_node].cluster_status_test_execution.ers_node }}
+                                        New ERS: {{ cluster_status_test_execution.ers_node }}
             test_case_details_from_test_case: {
                                         "Pre Validations: Validate SCS cluster status": "{{ cluster_status_pre }}",
                                         "Pre Validations: CleanUp any failed resource": "{{ cleanup_failed_resource_pre }}",
                                         "Test Execution: Kill Message Server Process": "{{ kill_ms_result }}",
                                         "Test Execution: Cleanup resources": "{{ cleanup_failed_resource_test_execution }}",
-                                        "Post Validations Result": "{{ hostvars[cluster_status_pre.ers_node].cluster_status_test_execution }}",
+                                        "Post Validations Result": "{{ cluster_status_test_execution }}",
                                         }
 # /*---------------------------------------------------------------------------
 # |                          Post Validations                                 |

src/vars/input-api.yaml

@@ -177,7 +177,7 @@ test_groups:
           ASCS node by forcefully terminating it using the kill -9 signal. It verifies proper cluster 
           reaction, automatic failover to the ERS node, and ensures service continuity after 
           the process failure.
-        enabled:                    false
+        enabled:                    true
 
       - name:                       "Kill Enqueue Server Process"
         task_name:                  kill-enqueue-server