Skip to content

Commit 2464102

Browse files
Added Time in both brief and detailed output
Signed-off-by: alokgoswami-ag <alok.goswami@ibm.com>
1 parent 25b5cf4 commit 2464102

File tree

1 file changed

+38
-1
lines changed

1 file changed

+38
-1
lines changed

monitor.py

Lines changed: 38 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from bs4 import BeautifulSoup
55
import urllib3
66
import requests
7-
from datetime import datetime
7+
from datetime import datetime , timedelta
88
import xml.etree.ElementTree as ET
99
import constants
1010

@@ -46,6 +46,38 @@ def fetch_release_date(release):
4646
return "Error while sending request to url"
4747
except json.JSONDecodeError as e:
4848
return "Failed to extract the spy-links"
49+
50+
def fetch_build_time(build):
51+
'''
52+
Returns the created time (HH:MM) and date (YYYY-MM-DD) of the release in IST
53+
'''
54+
url = constants.PROW_VIEW_URL + build[8:] + '/prowjob.json'
55+
56+
try:
57+
response = requests.get(url, verify=False, timeout=15)
58+
response.raise_for_status() # Raise exception for non-200 responses
59+
60+
buildtime = response.json() # Directly parse JSON
61+
timestamp_str = buildtime["metadata"]["creationTimestamp"]
62+
63+
# Convert timestamp to datetime object (UTC)
64+
utc_time = datetime.strptime(timestamp_str, "%Y-%m-%dT%H:%M:%SZ")
65+
66+
# Convert UTC to IST (UTC +5:30)
67+
ist_time = utc_time + timedelta(hours=5, minutes=30)
68+
69+
# Extract date and time separately
70+
ist_date = ist_time.strftime("%Y-%m-%d") # YYYY-MM-DD
71+
ist_time_formatted = ist_time.strftime("%H:%M") # HH:MM (without seconds)
72+
73+
return ist_date, ist_time_formatted # Returning both date and time
74+
75+
except requests.Timeout:
76+
return "Request timed out", None
77+
except requests.RequestException:
78+
return "Error while sending request to URL", None
79+
except (json.JSONDecodeError, KeyError):
80+
return "Error while parsing prowjob.json", None
4981

5082
def set_prow_url(ci_job_type: str)->str:
5183
'''
@@ -1219,6 +1251,7 @@ def get_brief_job_info(build_list,prow_ci_name,zone=None):
12191251
for build in build_list:
12201252
match = re.search(pattern_build_id, build)
12211253
build_id = match.group(1)
1254+
_,time=fetch_build_time(build)
12221255
lease, _ = get_quota_and_nightly(build)
12231256
if zone is not None and lease not in zone :
12241257
continue
@@ -1229,6 +1262,7 @@ def get_brief_job_info(build_list,prow_ci_name,zone=None):
12291262
job_dict = {}
12301263
job_dict["Job"] = prow_ci_name
12311264
job_dict["Prow Build ID"] = build_id
1265+
job_dict["Time"]=time
12321266
job_dict["Install Status"] = cluster_status
12331267
if sensitive_info_expose_status == True:
12341268
job_dict["Lease"]="Build log removed"
@@ -1284,7 +1318,10 @@ def get_detailed_job_info(build_list,prow_ci_name,zone=None):
12841318
builds_to_deleted.append(build)
12851319
continue
12861320
i=i+1
1321+
date,time=fetch_build_time(build)
1322+
12871323
print(i,"Job link:"+constants.JOB_LINK_URL+build)
1324+
print("Build started time: "+time +" "+date)
12881325

12891326
build_status = check_job_status(build)
12901327
sensitive_info_expose_status=check_if_sensitive_info_exposed(build)

0 commit comments

Comments
 (0)