Merge pull request #56 from KeerthanaAP/all_jobs

Added changes to check node details of compact run

Author: Power Cloud Robot

CI_JobHistory.py

@@ -169,22 +169,14 @@ def display_ci_links(config_data):
             ci_name_list.append(ci_name)
             print(j,'',ci_name)
         j=j+1
-        print(j, " All")
-
-
+        print(j, " All the above")
         option = input("Select the required ci's serial number with a space ")
-
         selected_options = option.split()
-
-   
         for ci in selected_options:
             try:
                 ci_to_int = int(ci)
-                if 0 < ci_to_int <= len(config_data):
+                if 0 < ci_to_int <= len(config_data)+1:
                     options_int_list.append(ci_to_int)
-                elif ci_to_int == len(config_data) + 1:
-                    for j in range (1, len(config_data)+1):
-                        options_int_list.append(j)
                 else:
                     return_value = "Enter the options in range of 1 to " + str(len(config_data)+1)
                     print(return_value)
@@ -199,15 +191,15 @@ def display_ci_links(config_data):
 
         selected_ci = config_vars.get('Settings', 'selected_ci')
         options_int_list = [int(value) for value in selected_ci.split(',')]
-        if len(ci_name_list)+1 in options_int_list:
-            options_int_list = [x for x in range(1, len(ci_name_list)+1)]
 
+    if len(config_data)+1 in options_int_list:
+        return config_data
 
     for i in options_int_list:
         config_temp_data = {ci_name_list[i-1]: config_data[ci_name_list[i-1]]}
         selected_config_data.update(config_temp_data)
         config_temp_data = {}
-    
+
     return selected_config_data
 
 def get_query_options():

monitor.py

@@ -359,7 +359,6 @@ def get_node_status(spy_link):
     Returns:
         string: Node Status.
     '''
-    
     job_type,job_platform = job_classifier(spy_link)
 
     check_for_gather_libvirt_dir = check_if_gather_libvirt_dir_exists(spy_link,job_type)
@@ -371,7 +370,7 @@ def get_node_status(spy_link):
 
     node_log_url = PROW_VIEW_URL + spy_link[8:] + \
         "/artifacts/" + job_type +"/artifacts/oc_cmds/nodes"
-    
+ 
     try:
         node_log_response = requests.get(node_log_url, verify=False, timeout=15)
         if "NAME" in node_log_response.text:
@@ -380,7 +379,7 @@ def get_node_status(spy_link):
                 return "Some Nodes are in NotReady state"
             elif response_str.count("control-plane,master") != 3:
                 return "Not all master nodes are up and running"
-            elif (job_platform == "mce" and response_str.count("worker") != 3) or (job_platform != "mce" and response_str.count("worker-") != 2): 
+            elif ((job_platform == "mce" or "compact" in node_log_url ) and response_str.count("worker") != 3) or ((job_platform != "mce" and "compact" not in node_log_url) and response_str.count("worker-") != 2): 
                 return "Not all worker nodes are up and running"
         else:
             return "Node details not found"