Merge branch 'main' into fix-release-date

Author: alokgoswami-ag

README.md

@@ -52,21 +52,52 @@ Create a virtualenv if required and install required packages using "pip install
     4. The CI_DailyBuildUpdates.py script when invoked with command line arguments info_type as "detailed" and zone, it will display the builds details in the provided zone.
 
         ```python3 CI_DailyBuildUpdates.py --info_type detailed --zone syd04```
+    
+    5. The CI_DailyBuildUpdates.py script when invoked with command line arguments info_type as "detailed" and --job_type as "pa", it will display the builds details in the given job type.
+
+        Supported value [p','z','pa'] 
+
+        pa - ppc64le architecture auxilliary jobs
+
+        p - ppc64le architecture periodic jobs
+        
+        z - s390x architecture periodic jobs
+         
+         ```python3 CI_DailyBuildUpdates.py --info_type detailed --job_type pa```
 
 
 
 2. **CI_JobHistory.py:** The CI_JobHistory.py is a script which allows user to query a specific information from all builds that ran on the CI system within a given date range.  
 
     ```python3 CI_JobHistory.py```
 
+    ```python3 CI_Jobhistory.py --zone ```     This command line allows user to fetch query based on zone type.
+
+    ```python3 CI_Jobhistory.py --job_type ``` This command line allows user to fetch query based on job type.
+             
+    ```python3 CI_Jobhistory.py --filter ```   This command line allows user to fetch query based on search filter.
+        Specify the filter string to fetch jobs (Example 'heavy build' / libvirt / powervs / upgrade /multi / 4.14 / 4.15 / 4.16 / 4.17/ 4.18 )'
+
+
+
     1. Interactive Execution: The CI_JobHistory.py can be executed in a interactive mode by setting JENKINS variable as False in config.ini file.
 
     2. Non-Interactive Execution: The CI_JobHistory.py can be executed in a non-interactive mode by setting JENKINS variable as True in config.ini file, along with the JENKINS variable user needs to provide values for the following variables:
         ```
         selected_ci: CI's from where to fetch the jobs.
+        query_option: Query code to fetch information from builds.
+            •	Check Node Crash: Detects if a node crashed during execution.
+	        •	Brief Job Information: Provides a summary of job execution.
+	        •	Detailed Job Information: Provides in-depth details of jobs.
+	        •	Failed Test Cases: Provides a list of test cases that are failed in the CI run.
+	        •	Get Builds with Test Case Failures: Identifies builds where given test cases failed.
+	        •	Test Case Failure Frequency: Analyzes how often test cases fail.
+	        •	Get Build Based on Release: Retrieves builds corresponding to a specific release
+                    release: release that needs to be checked
+                    next release: next release or latest
+                    
         before_date: End date.
         after_date: Start date.
-        query_option: Query code to fetch information from builds.
         tc_name: Testcase name which will be used in quering the failure frequency.
         ```
 

monitor.py

@@ -4,6 +4,7 @@
 from bs4 import BeautifulSoup
 import urllib3
 import requests
+import time
 from datetime import datetime , timedelta
 import xml.etree.ElementTree as ET
 import constants
@@ -586,44 +587,54 @@ def get_quota_and_nightly(spy_link):
     '''
 
     _,job_platform = job_classifier(spy_link)
-    lease = ""
+    lease = None
+    nightly = None
+    max_retries = 3
+    delay = 5  # seconds
     build_log_url = constants.PROW_VIEW_URL + spy_link[8:] + "/build-log.txt"
-    try:
-        build_log_response = requests.get(build_log_url, verify=False, timeout=15)
-        if 'ppc64le' in spy_link:      
-            if job_platform == "libvirt":
-                job_platform+="-ppc64le-s2s"
-            elif job_platform == "powervs":
-                job_platform+="-[1-9]"
-            lease = get_lease(build_log_response,job_platform)
-            nightly = get_nightly(build_log_url,build_log_response, 'ppc64le')
-
-        elif 's390x' in spy_link:     
-            job_platform+="-s390x"
-            lease = get_lease(build_log_response,job_platform )
-            nightly = get_nightly(build_log_url,build_log_response, 's390x')
-        elif "multi" in spy_link:
-            if "powervs" in spy_link:
-                job_platform = "powervs"
-                job_platform+="-[1-9]"
-                lease=get_lease(build_log_response,job_platform)
+    for attempt in range(1, max_retries + 1):
+        try:
+            build_log_response = requests.get(build_log_url, verify=False, timeout=15)
+            if 'ppc64le' in spy_link:      
+                if job_platform == "libvirt":
+                    job_platform += "-ppc64le-s2s"
+                elif job_platform == "powervs":
+                    job_platform += "-[1-9]"
+                lease = get_lease(build_log_response, job_platform)
+                nightly = get_nightly(build_log_url, build_log_response, 'ppc64le')
+
+            elif 's390x' in spy_link:     
+                job_platform += "-s390x"
+                lease = get_lease(build_log_response, job_platform)
+                nightly = get_nightly(build_log_url, build_log_response, 's390x')
+
+            elif "multi" in spy_link:
+                if "powervs" in spy_link:
+                    job_platform = "powervs-[1-9]"
+                    lease = get_lease(build_log_response, job_platform)
+                else:
+                    job_platform = "multi"
+                    lease = get_lease(build_log_response, 'libvirt-ppc64le-s2s')
+                nightly = get_nightly(build_log_url, build_log_response, "multi") 
+
+            elif "mce" in spy_link:
+                job_platform = "aws"
+                lease = get_lease(build_log_response, job_platform)
+                nightly = get_nightly(build_log_url, build_log_response, "multi")
+
             else:
-                job_platform="multi"
-                lease=get_lease(build_log_response,'libvirt-ppc64le-s2s')
-            nightly = get_nightly(build_log_url,build_log_response, "multi") 
-
-        elif "mce" in spy_link:
-            job_platform = "aws"
-            lease = get_lease(build_log_response,job_platform )
-            nightly = get_nightly(build_log_url,build_log_response, "multi")
-        else:
-            # lease is not applicable for SNO
-            nightly = get_nightly(build_log_url,build_log_response, "multi")    
-        return lease, nightly
-    except requests.Timeout:
-        return "Request timed out"
-    except requests.RequestException:
-        return "Error while sending request to url"
+                # lease is not applicable for SNO
+                nightly = get_nightly(build_log_url, build_log_response, "multi")
+
+            break  # If successful, break out of retry loop
+
+        except (requests.Timeout, requests.RequestException) as e:
+            if attempt == max_retries - 1:
+                print(f"Request failed after {max_retries} attempts: {e}")
+            else:
+                time.sleep(delay)
+
+    return lease, nightly
 
 def job_classifier(spy_link):